OSDN Git Service

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

Change-Id: Icdff0ea2225fe1dd8e1b587f829b005810413655


Trivial merge