commit | 5f9fbd543764c129275fdb5542a7f5c15a0e3810 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 07 12:41:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 12:41:28 2017 +0000 |
tree | 37326b2457e84b95cba75144c2f592060f1428e9 | |
parent | 6ec4c2e3aff427690e9d27625b583add7f98b4f1 [diff] | |
parent | 0dedc7e41f9f46c4428f8e520ba87409193e94e9 [diff] |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73 -s ours am: 0dedc7e41f Change-Id: I78ac7406d97accf15e1f76156f7530fcdf106ee8