OSDN Git Service

Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp
authorThe Android Automerger <android-build-merger@google.com>
Mon, 29 Aug 2016 23:08:54 +0000 (23:08 +0000)
committerThe Android Automerger <android-build-merger@google.com>
Mon, 29 Aug 2016 23:08:54 +0000 (23:08 +0000)

Trivial merge