OSDN Git Service

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am...
authorZach Jang <zachjang@google.com>
Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)
am: e7bc1542db

Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32


Trivial merge