commit | a038fb9044f7ea86bd79737579e227fdfe3aeb6e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 15:23:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 15:23:18 2017 +0000 |
tree | 6bcffc7b75af3ac765d2ee2bac8729ebbca04a04 | |
parent | 82c94efa69752fbcad91458f9f01f2a6966c0a84 [diff] | |
parent | 4f83509810b4ead1e48af0156f91ed7ce5fc2db8 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours am: 4f83509810 Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35