| commit | fadac24ddd8b0ed9c6c1be4da02b0f4503c8648c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Sat Jan 14 07:40:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 14 07:40:42 2017 +0000 |
| tree | 8c408d5fe677a45c0a1df8351e410021bc41b88f | |
| parent | c23f85d24449b1ed45f51f75419ade7b9ebd024c [diff] | |
| parent | 6bf40ddf1c484404a70c3217ebfb47ce504d9f93 [diff] |
resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp am: 6bf40ddf1c Change-Id: I884f2b7b7c0abdd8dee7540905b6158dcce6cc2d