OSDN Git Service

Manually merge commit '398e284' into stage-aosp-master am: e591ad15a0
authorJin Qian <jinqian@google.com>
Sat, 3 Dec 2016 04:15:04 +0000 (04:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:15:04 +0000 (04:15 +0000)
am: f39613a549

Change-Id: I85e3ea26f9406a8852a2160a9ddcd761c1ac4ac2


Trivial merge