| commit | a1b416e6621f6f761ff9138f11c8a2db73f36711 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:35:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:35:51 2017 +0000 |
| tree | 17b12998295c1f74feacdd55f36bc3856032dfaa | |
| parent | 7a195ac7f06453ccac9fc10f15f1bae5ecb1d103 [diff] | |
| parent | 7cf612ea28eb73798fe2fc31dc289a8a5b8ce48e [diff] |
DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f -s ours am: 74de8ccdf6 -s ours am: adeb6f14de -s ours am: 34c7705205 am: 7cf612ea28 -s ours Change-Id: Ia448772227d516f828e483453b885a3997ec93a2