OSDN Git Service

Merge changes I98c9329f,I40936f7b,I09d20ff1 am: 1159c196db am: d7fc79ad53
authorJosh Gao <jmgao@google.com>
Wed, 29 Jun 2016 22:00:52 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 22:00:52 +0000 (22:00 +0000)
am: 41ccbf9729

Change-Id: Ic0e62cf54e8254e04d61e020cdb0d2a08f0d6959


Trivial merge