OSDN Git Service

Merge changes I7718b1ba,I648adc35
authorJosh Gao <jmgao@google.com>
Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)
am: 4f62c5b311

Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f


Trivial merge