commit | bb07d2b843896a69d2045672dd32c991e209fdab | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 04:47:10 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 04:47:10 2017 +0000 |
tree | fd146afd973bb5cb42e338cfd48db691e4092c87 | |
parent | 93fcde8d8a6bf7bf75d0147062204f673b5105a8 [diff] | |
parent | f04cb090da076c6aedc226195ed1bd088cc30be7 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 4ff40ccbfd -s ours am: 690dbecf8a am: f04cb090da -s ours Change-Id: I739aa6ff31ad0412b839b6ed5521a815ad19cf06