| commit | 89c5231255986b07fe4f7aaf1163be41fd6e29f4 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:39:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 11:39:44 2017 +0000 |
| tree | 5675c0d123080a1ed3bcf556cebe8fbeabca1f8f | |
| parent | 0e794ff60426b31539a616edc544289bd2e85982 [diff] | |
| parent | 6c9f2593166fa84a9c24628b8339e30fe52edb15 [diff] |
resolve merge conflicts of 5ab03cb41 to oc-mr1-dev-plus-aosp am: 70f5571a9a Change-Id: Ia4177e72e36dddcc01f38547a15c4fbf06d70174