| commit | e5abacdd341bbf9f2d294c3f7ed1903dda7897e4 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 11:38:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 11:38:19 2017 +0000 |
| tree | 9d55abfe1c083ff34cbb89a721c0409c5f8d6063 | |
| parent | 391e142fea558c94815f5ef4a7da148b6a2ffd9e [diff] | |
| parent | 9175ac3b242057d306b04a6f2f37fedace748b9b [diff] |
resolve merge conflicts of 7827bcc3e to oc-dev-plus-aosp am: 9175ac3b24 Change-Id: I9b1ccf3ae7c493277830824fa41fc6133d4ff8c8