commit | c5bff0f79849d7f6b1853c8bdf69d977af5209ed | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 19:32:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 19:32:42 2017 +0000 |
tree | 8a3b7c5742ba2987dda6f3dfa39f0fa5c9cdc17b | |
parent | f3aa25f12c06a1d89f0aaa5cf715f97adae88db0 [diff] | |
parent | 9cfd7f327236a8cd9b371be3232a2d5ddf936d0b [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 879d439e26 -s ours am: 9cfd7f3272 Change-Id: Id1fd28cabad8815dfb80d6b3100d4502c34410d8