| commit | cdd64207c66e447a769bd4de9b0275b2710a4c6e | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 10:27:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 10:27:13 2017 +0000 |
| tree | 7dea8bd5c9ad8e0fe65728a8b9d4a484e85ed249 | |
| parent | 020e56763ff82f8a33658ae2063c8768e2d3b117 [diff] | |
| parent | 39fea6b6dcb3c1ba46364c153ca482a9f5f8e235 [diff] |
Merge "resolve merge conflicts of c2421a2a3c37 to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 39fea6b6dc Change-Id: I492f304537eb73c630d92de77505840cdd4f9257