OSDN Git Service

Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
authorAjay Panicker <apanicke@google.com>
Mon, 26 Sep 2016 19:15:22 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Sep 2016 19:15:22 +0000 (19:15 +0000)
am: 496548f784

Change-Id: Id89d0cadb3f676d4aee989d6e6a60272ff1eb694


Trivial merge