| commit | 9580c075381550ff829f5d05e64569f61fe62d55 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 03 01:02:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 03 01:02:00 2017 +0000 |
| tree | 751fe3cf136d59af769a5eca7fb648c0b5ff9038 | |
| parent | 3fad821144029095e61fbdb92a02851819af2cdc [diff] | |
| parent | b127b6c4a829c0f7e0be3bf37c3d0214b0d850d3 [diff] |
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 04a8b2b532 am: b127b6c4a8 Change-Id: I6e8101e4dc98a6fc080f50ed7f4e96ee2e9e2bf9