| commit | 11275ae0283ef28d3eabfec3433c4254ad77d06f | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Dec 15 00:27:53 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 15 00:27:57 2016 +0000 |
| tree | 1ca0486a4663f5b6a75beeb84cfe9dbe429fb661 | |
| parent | b78f75108db87bc2cab8499e53eff9220145b0d4 [diff] | |
| parent | 5c7ef9ccc7d9cdef55f539c9ab61454bdeae06f8 [diff] |
Merge "resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d am: 2f94877c01"