| commit | 7819b010dd4da0bc687eeaacc27c26d9994b5e9e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:15:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:15:38 2017 +0000 |
| tree | e6ec0d72c260974a8a712d3cdf8d242645fb73c7 | |
| parent | 669f9209b1c53bcc9b82b3f1b77de51635c5626c [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 Change-Id: I413ffa000d3ef4cb03cfe37355309171e3709c83