commit | 2cae880b17e76fefc70df96f52c039c459d1c4e8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 09:08:22 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 09:08:22 2017 +0000 |
tree | 0b129f8c08afa9e7e75375a14746097e14ba1db6 | |
parent | b97778712a7b129ca2288bacf4d3c4d5c396cefc [diff] | |
parent | a18b19b39cd5841d0998064055d43261dec486a4 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c3c1ae81aa -s ours am: a18b19b39c Change-Id: Ie0b20b1d369a268d271bb69b8eafe798f8e42640