| commit | 7d64d30d0dcdb97be921790e2702e5adfe751d92 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 21:33:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 21:33:07 2016 +0000 |
| tree | 440252f501c141fe4416dfc58898edce7e41681d | |
| parent | 81b0d510e8ab71649aa7478d722ebb0d99cab8d9 [diff] | |
| parent | a944197b97b4e64ffb3abe91218d1db06ea9d7de [diff] |
resolve merge conflicts of 6ae8c7b to stage-aosp-master am: 32d6e5f0eb am: a944197b97 Change-Id: I03472be260cbfdaf436514d319e91063c738b82c