| commit | 57c50525133d312ca41504f58ef21c3da58bdf65 | [log] [tgz] |
|---|---|---|
| author | Ian Elliott <ianelliott@google.com> | Tue Jul 18 21:48:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 21:48:11 2017 +0000 |
| tree | 11d0fdb963b70ea3cf29954974c9c90f7e156208 | |
| parent | 0d0167e6265e1e860f14e925209478363cb57f33 [diff] | |
| parent | 72f1824c46fcb8c66f5a92c1328508b831c971ae [diff] |
Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: 72f1824c46 -s ours Change-Id: Id0de85cb32bfc7d90cf048639c4d3a6a21d63a54