| commit | 9b5c2814816ca53660ef5d71f22a53a7b4b431aa | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 28 16:43:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 28 16:43:30 2017 +0000 |
| tree | 002f9402bca7d844741a2e7f5f115752c8550fbe | |
| parent | b2b9ac2c71f7ed9dbc60e32259fbf07d18ddf6ca [diff] | |
| parent | e8f5bbf82b51667b12785e161e33b227cf828e91 [diff] |
Merge "resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp" into oc-dev-plus-aosp am: e8f5bbf82b Change-Id: I892a296a98a49ad5806d9489a3a9b53f4162b429