OSDN Git Service

Merge "Merge changes Ibc1444b8,I14c200d1 into oc-dev am: fd43dc6723 am: eb444d602c...
authorEino-Ville Talvala <etalvala@google.com>
Wed, 14 Jun 2017 08:18:20 +0000 (08:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 08:18:20 +0000 (08:18 +0000)
am: 8b689d1683

Change-Id: If251537b609fa2827b886ddc847c963a9588fcb5


Trivial merge