| commit | 915f756d47a2d2e5b1b5249ef1a05ae83d4c0ff1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 01 13:50:18 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Tue Aug 01 13:50:46 2017 -0700 |
| tree | d12417d6c1f0dc6f0bfeadcf8571ca6f4d7c298b | |
| parent | c333235b06c7eec59d6a0d673105b63d77176dfa [diff] | |
| parent | e31a208e36f015ee0fd30e66de304e537f515c28 [diff] |
DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. Bug: 64219148 Test: build Change-Id: Ic90155ad560f39f9e6fd1a8035e0d031ec0df0d1