| commit | 515b92cd83c47f2f1596037579a57ee1022012b0 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Apr 20 16:14:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 16:14:29 2017 +0000 |
| tree | 4bb47515fadfd061787ca0a643c040ae5be08138 | |
| parent | 8bb1757531c0269c24d164087f793d638adf9639 [diff] | |
| parent | 3ff96e5dd806f6ce608248f5698fbebdcec4f58c [diff] |
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp am: 3ff96e5dd8 Change-Id: Icc32ac9d8b5301e43579194736cceb24637de0c8