| commit | 6155b40830e7945e9d4a76fe89af9a6322d4977f | [log] [tgz] |
|---|---|---|
| author | Pablo Ceballos <pceballos@google.com> | Thu Jun 30 17:01:49 2016 -0700 |
| committer | Pablo Ceballos <pceballos@google.com> | Thu Jun 30 17:01:49 2016 -0700 |
| tree | 6c6a6d92c70e55a8754189457c0625f9ed204d3b | |
| parent | 4131d908551bfe0f5551312111dec3966df9a0be [diff] | |
| parent | 746766539386226e86b4018c3bb878a07a4f4d11 [diff] |
resolve merge conflicts of 7467665 to nyc-mr1-dev-plus-aosp Change-Id: I69094217d8f09b44d38fefd48d1717322cfca55d