OSDN Git Service

Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev am: 1340221244
authorJorim Jaggi <jjaggi@google.com>
Tue, 2 Aug 2016 18:53:34 +0000 (18:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 18:53:34 +0000 (18:53 +0000)
am: 3e3896655d

Change-Id: If8640aa6db9ebfefabac21f6657e27c29f099d32


Trivial merge