OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorBill Yi <byi@google.com>
Wed, 24 Aug 2016 20:11:30 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:11:30 +0000 (20:11 +0000)
am: e71ecb2c4d

Change-Id: Ic7d3bae780b52236b3fff2ab4d97ce1557129f0f


Trivial merge