| commit | b56f6f45d51b70185a98a9ab95348f21f23cd1a4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 22:33:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 22:33:46 2017 +0000 |
| tree | 17b12998295c1f74feacdd55f36bc3856032dfaa | |
| parent | 7cf612ea28eb73798fe2fc31dc289a8a5b8ce48e [diff] | |
| parent | fe347a5d71a8d09178dab8443385a5ac0a923afe [diff] |
DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f am: fe347a5d71 Change-Id: I40913c9f2299acff71e00b45fae7bf692127f207