| commit | c297d92ed33b69b2e7f1c1c8a8e48783a9c199f0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:32:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:32:30 2017 +0000 |
| tree | c18104515231b1904e51853528616c4e11ca98d2 | |
| parent | 494b0515b81e75c7575f1922a122743572e4ab3d [diff] | |
| parent | 702a04cb1dcb722428ef5286f6c3f70d0fbf01cd [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 am: 8272ed7d35 -s ours am: 6b616ebc08 -s ours am: 702a04cb1d Change-Id: I4efcafa387eca97b1dc006f9fe7ee29c300e5baf