| commit | 7cf612ea28eb73798fe2fc31dc289a8a5b8ce48e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:32:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:32:31 2017 +0000 |
| tree | 17b12998295c1f74feacdd55f36bc3856032dfaa | |
| parent | 470394b28079b8cc0bd19d0fd6e31e344013ce0a [diff] | |
| parent | 34c7705205f1f551fd6c3a4baee065f467a2011d [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 Change-Id: I5eae95b33ae6564efcf73f4f04f3d7b7fe04257b