OSDN Git Service

Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp
authorNingyuan Wang <nywang@google.com>
Mon, 29 Aug 2016 23:22:34 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 23:22:34 +0000 (23:22 +0000)
am: 97f359427d

Change-Id: I1cacd37dbcb388a04a983fc878b61190fe28adc1


Trivial merge