| commit | e6f34eb2b1286706ddb5767e4c5ade57d204ed78 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sun Dec 10 00:21:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Dec 10 00:21:48 2017 +0000 |
| tree | fe6dd0a3487802d48f202ea15197baa5a04eb808 | |
| parent | 975fb3562e03b22a9b1d938a3ff4565fbc9696e0 [diff] | |
| parent | 0bd82038bc37b8577701258d6e6552d5aa92a4ce [diff] |
Revert "Merge remote-tracking branch 'aosp/upstream-master' into 'aosp/master'" am: be7549061d am: 0bd82038bc Change-Id: I494f2af9813e2b58a59879f220da4adcb82af418