commit | 8272ed7d359b59d52b87ba69279b5dfb3da2d8bf | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 03 21:14:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:14:48 2017 +0000 |
tree | 9f43c9f35e3bacbad225375ccd341c436cd59c04 | |
parent | 2f6f6abe4d05282c82dd56fa897949f49ac3cd6c [diff] | |
parent | 1cc4f4ec49f99352498007b67a75fefa0f57e494 [diff] |
DO NOT MERGE: Merge commit '2f6f6abe4d05282c82dd56fa897949f49ac3cd6c' from oc-support-26.0-dev to stage-aosp-master. am: e15c52f95e -s ours am: 1cc4f4ec49 -s ours Change-Id: Ibdb7ca19bc24145689737000a268679a9b5be99b