| commit | 5b1c4bc2c8ed02f8e59ca1beb7ca66e36427e03d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:35:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:35:53 2017 +0000 |
| tree | 52ce0381774132a25b1e16a7205133ef6af2f37f | |
| parent | 05cb647afbd23722f107c89a9a051c2bb6658292 [diff] | |
| parent | c297d92ed33b69b2e7f1c1c8a8e48783a9c199f0 [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 am: c297d92ed3 -s ours Change-Id: I20acb26c76a592c73d6e24972f8d86a0946149d1