commit | 95d8a11259bc47d55b45bd5e1e13e41e83c99278 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 03:31:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 03:31:13 2017 +0000 |
tree | 943d1e546887dd8d184d1e722e8146f56887df55 | |
parent | dec91c40dab3b7edc0adca8a0e9eb533b1ffa297 [diff] | |
parent | 5428ef8dc9dab92c868303c25ac259cb689a8b0a [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f0d0a01dc2 -s ours am: fe550a168b am: 5428ef8dc9 -s ours Change-Id: Ifdd3bcdf482314a714730e16c44995e9058ed43d