OSDN Git Service

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
authorHugo Benichi <hugobenichi@google.com>
Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)
am: 2c856480a0

Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee


Trivial merge