commit | 94a41bbb40c92f1b4239de4649d1ce68e32ca080 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 04:38:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 04:38:46 2017 +0000 |
tree | cc2131f4ca5f153ba35778ca4252ff3a875f67e9 | |
parent | a156bac831da5f8e2390e42c0350c5251af46528 [diff] | |
parent | 6ab6e15c9566f8ffe11d2fa94205903efcb1f607 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753 -s ours am: edb2373362 am: 6ab6e15c95 -s ours Change-Id: I9cd784500a3dfc6e3b40751840a95fda3a2ba632