| commit | 4414db2da2ae6950a7506d9019b7eb9d17adf823 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 26 10:20:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 26 10:20:39 2017 +0000 |
| tree | 433709091bea6301cd0a61893c657c7e25083798 | |
| parent | ea60f1d6d6d863e1e0827a95b9b4fd081464546d [diff] | |
| parent | b118505ef0ec62b26088a9f4247f51cd73acc253 [diff] |
Merge "resolve merge conflicts of 255b69aca02f to oc-dev-plus-aosp" into oc-dev-plus-aosp am: b118505ef0 Change-Id: I6e9963188b487de4e76dc0d17d56b53050fd3745