| commit | fe347a5d71a8d09178dab8443385a5ac0a923afe | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:15:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:15:40 2017 +0000 |
| tree | be0e7cd7d6f457268c84e1f036bca2a2b9bd84e0 | |
| parent | 54976f107c42838c2de5dc5805c7afe7b5558fd8 [diff] | |
| parent | 204e9aac8f80368d182c4ffc8d1a485a9344078f [diff] |
DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f Change-Id: I6761c36507afd4561f65a58d853320f07e500221