| commit | 2cfdee9a27cf86eca807b3bf8446ba465c53aa16 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 02 03:41:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 03:41:03 2017 +0000 |
| tree | 1ed8a1c813b7950106df8e7d83ae4ee8eaeb1f7e | |
| parent | d350b406cb640c99401b0ce4e02b5d31ac13abb2 [diff] | |
| parent | 98e9da10bdf72e9bdda6edf8815ecf7007f0561c [diff] |
DO NOT MERGE: Merge commit '3bf771df3dc4bdb3d71c7ca3cc5aa3fdca8a4797' from oc-support-26.0-dev to stage-aosp-master. am: c1172c51af -s ours am: 98e9da10bd Change-Id: I60d1e78d331adf0e4dff822887f2224f4b0a3f05