| commit | 50b7faa0310cd41ceeb0153b57436b7617eca58b | [log] [tgz] |
|---|---|---|
| author | Lei Yu <jackqdyulei@google.com> | Mon Oct 29 13:55:51 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 29 13:55:51 2018 -0700 |
| tree | 4b423028daa7e99ff48cb842a337ef0102168204 | |
| parent | 5422d7ea0a3e98815868d8da936ee47003341978 [diff] | |
| parent | 73c361b544d49aaf1424d8d30290ccaebb273be8 [diff] |
[automerger skipped] Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp" am: 73c361b544 -s ours Change-Id: I93e8e42b3892dae3d2ab8ed7683503079e93df1a