OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorBill Yi <byi@google.com>
Tue, 6 Dec 2016 23:40:36 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 23:40:36 +0000 (23:40 +0000)
am: 0dd27eb2b5

Change-Id: I073a492a7e0b7ce8ff4dd108da20e2d5e77cff98


Trivial merge