| commit | 5c7ef9ccc7d9cdef55f539c9ab61454bdeae06f8 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Thu Dec 15 00:27:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 15 00:27:08 2016 +0000 |
| tree | 0f5d10beae448cc6d9ca433979cbc764a5ed7064 | |
| parent | 52d600769c57368c8c5f6fd8d6accde3b733b8c0 [diff] | |
| parent | 2f94877c0178cd3c109f4a298c922a7470b97186 [diff] |
resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d am: 2f94877c01 Change-Id: I00f1e604816bd95b4ecc3063209e38780a4e8675