commit | 33fa441a86c99ae11907d1556c9e540bc7c16978 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 03:35:08 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 03:35:08 2017 +0000 |
tree | 1bb07c9886e34148cbc97b96687474d40dbfc032 | |
parent | c66dbdc2c505e5f0e93d28823e9c9965783f26f3 [diff] | |
parent | a038fb9044f7ea86bd79737579e227fdfe3aeb6e [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours am: 4f83509810 am: a038fb9044 -s ours Change-Id: Ibfdba393783ac392dde8a42418b3cf8bfc8e34ff