commit | 405314dd0c4101cbba1b1dd08c2cdf9ec540f534 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 02:31:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 02:31:24 2017 +0000 |
tree | 0b129f8c08afa9e7e75375a14746097e14ba1db6 | |
parent | c5de8b3a2f7485bfa747c02829cf0940d63a6cd1 [diff] | |
parent | 2cae880b17e76fefc70df96f52c039c459d1c4e8 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c3c1ae81aa -s ours am: a18b19b39c am: 2cae880b17 -s ours Change-Id: I45871d5a74fece85fd48b88c4e25f6b8951f6959