commit | de716e6c85efcd0e7d9b6907be483c9ace669503 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 04:27:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 04:27:47 2017 +0000 |
tree | 5e6f4c130d0aadccaf29c955b3c968dc3a7b29f5 | |
parent | 484a7bd48cb51b32a7b37d4d2fb570d62029d050 [diff] | |
parent | f1cd14ca8133938883f3df5f8d74dc85f0ccdd35 [diff] |
DO NOT MERGE: Merge Oreo MR1 into master am: f1cd14ca81 -s ours Change-Id: Ic6b8a7a675d2b4a974057edd33f7686422a8f0eb