OSDN Git Service

Merge changes I104e6133,I54f04c03 am: 191ddb0c27
authorRobert Sesek <rsesek@google.com>
Mon, 12 Sep 2016 21:04:43 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Sep 2016 21:04:43 +0000 (21:04 +0000)
am: 80c75db311

Change-Id: Ic8a6c7776418240154ec350dd1f72638b4129c18


Trivial merge