OSDN Git Service

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

Change-Id: I888a0d89112441f4b7bbd7fed582646dc053bccd


Trivial merge