commit | 975d17c1e399d4c0d1a204d8243bcb62f0b8114a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 09:40:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 09:40:28 2017 +0000 |
tree | 4d25e164440f74b518a137878002d5420db94f77 | |
parent | d7faa582f6dc398e1fb4794bcf4e9beac7467bcd [diff] | |
parent | 969a7ca58b800fdcae32c4784c37b829088d4e55 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5a0ca15349 -s ours am: 969a7ca58b Change-Id: I9a2b7fe74ee703cd4fc7b025d3234ba1ec2a905b