commit | 12f62f1c93425ec51f542779d205266dd787d56f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 02:31:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 02:31:49 2017 +0000 |
tree | 09a03a767f0f8c33df3ac83bfe1dca56ce238002 | |
parent | ab597229065f897d60554e4953f57c98872fcfda [diff] | |
parent | 7f31cd05e21a946c1ef1cefb6f0c414c1c5e4be3 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: ba99b11181 -s ours am: 82904944c8 am: 7f31cd05e2 -s ours Change-Id: I4002dd15e2d424ac0ab7fb4eef986f6b5e2c102a