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)
commit82a1502c096326016de66ec41450a2b30bfc8db2
tree9afb3e40a535347313278d380be166eb0c15a422
parent9b6737e86d0424c2707a8d64aee1bbe0789fd051
parentdfff1fc6c81e72598dce8b10d16bdaf9537ce944
Merge changes I6932803a,Ia65c038e am: 85b15b1d0b
am: dfff1fc6c8

Change-Id: I4c12db3905a6ad852410dbe203eecd4ed3e000de