OSDN Git Service

Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am:...
authorAdam Seaton <aseaton@google.com>
Tue, 23 May 2017 20:33:00 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 20:33:00 +0000 (20:33 +0000)
am: ffb37ffc45

Change-Id: I59936b65e75bf79aad233500bcb0ab4a6faf1bdd


Trivial merge