OSDN Git Service

Merge changes I6932803a,Ia65c038e am: 85b15b1d0b
authorJosh Gao <jmgao@google.com>
Thu, 1 Sep 2016 22:49:28 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 22:49:28 +0000 (22:49 +0000)
am: dfff1fc6c8

Change-Id: I4c12db3905a6ad852410dbe203eecd4ed3e000de


Trivial merge