| commit | fb5c675b7e1fee074f19cf1866b5dda0785dbe64 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Jul 29 10:08:16 2016 -0700 |
| committer | John Reck <jreck@google.com> | Fri Jul 29 10:08:16 2016 -0700 |
| tree | 54c983e39ad8a3ee94062b8c509054ba87c9c81d | |
| parent | 942ad98481be73e1f4efe0e6837d8930ec4d9d6b [diff] | |
| parent | 67daab6a1e0897cd0528a19071eeb9f4a2b00b49 [diff] |
resolve merge conflicts of 67daab6 to nyc-mr1-dev-plus-aosp Change-Id: I35f867b8d6408a7eae9cf5643f0908259de90cb1