| commit | 66023d7d8ac716edcb5ce3b1c14fe03fbe7b0ef6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 02 03:54:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 03:54:40 2017 +0000 |
| tree | 00b92db32310df457681b885b6b46f891687869d | |
| parent | 22dd25b006eaec6a3458213c67b1d543e768fe2e [diff] | |
| parent | 9790a4d87804a9dc8759e5bc8b3860a0d379dfe9 [diff] |
DO NOT MERGE: Merge commit '3bf771df3dc4bdb3d71c7ca3cc5aa3fdca8a4797' from oc-support-26.0-dev to stage-aosp-master. am: c1172c51af -s ours am: 98e9da10bd -s ours am: fc10ea9a51 -s ours am: 9315c0d611 -s ours am: 9790a4d878 Change-Id: Id1017144ee094dc9219c8e2935439afd87bca2b3