OSDN Git Service

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

Change-Id: Ib71b4c25ad73b9ff7eb9d478500bcf65a7b5627a


Trivial merge