commit | 773c4b2fbe4ef8e09ea0ace3945127fc74db48e6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 04:52:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 04:52:00 2017 +0000 |
tree | e14551538e69da23f4a8b9bf4af6d3e233e4380e | |
parent | fea840a1ea0dbcc0690c80c914164c10aea8e8f2 [diff] | |
parent | 5f9fbd543764c129275fdb5542a7f5c15a0e3810 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73 -s ours am: 0dedc7e41f am: 5f9fbd5437 -s ours Change-Id: I7d963418fb15c7d6f83fa61f00fadd5ea2ab6ec0