commit | 60fb538432748e3d8a8c4f0b9014c2a696e8b4db | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 03:32:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 03:32:00 2017 +0000 |
tree | d89b695f1ad0b9aeae0f85a9fe3f1b2ff7ed77d6 | |
parent | d326a1dc4e89b3a3f0170b438304901aa31bf146 [diff] | |
parent | e38271a71c06f3b06f21da7d70410d41b28ba15f [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d40f3dd810 -s ours am: e84916916f am: e38271a71c -s ours Change-Id: Id2ae18f106b43c4ca2c0d99bb7c230929dd55b4b