| commit | b6396a140e8c7b4fb33efc03ccffdf5ecf788ad6 | [log] [tgz] |
|---|---|---|
| author | Zheng Zhang <zhzh@google.com> | Wed Aug 09 23:44:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 09 23:44:42 2017 +0000 |
| tree | ae71ba7aec988588411ccb7c065129251e5e85ee | |
| parent | 522af93749553d9de12c0dcfc67606db7474274f [diff] | |
| parent | eb076a59506b1a5c35cca2153145984264008261 [diff] |
Merge changes from topic 'am-aaff2463b12d45fc8aad2131d8ac7b9f' into oc-dr1-dev-plus-aosp am: 0af0b60db5 am: eb076a5950 Change-Id: I31c1d4d0bc2c4a8468cbdcb9f333f5117f39d281