OSDN Git Service

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

Change-Id: I8651d7ebd3694ac715dcaac6f46d7094c5e327eb


Trivial merge