commit | b127b6c4a829c0f7e0be3bf37c3d0214b0d850d3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Nov 03 01:00:30 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 03 01:00:30 2017 +0000 |
tree | fefd221e7988220ebb1e44489d5e2ae2538f6498 | |
parent | 1d71857179f33698363360a9eb980d0952801798 [diff] | |
parent | 04a8b2b5325b27edf84d505b42c7b97dcdeed315 [diff] |
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 04a8b2b532 Change-Id: Ib5b0e4e8e215229f7427f358dfa69e06ba466e58