| commit | 37ac5e3fdae9fa33d669b5182741b07abca52a59 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Jun 28 19:20:18 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Tue Jun 28 19:20:18 2016 -0700 |
| tree | 762b20f69e99b644c797e20dc70574e5b7f67c0f | |
| parent | 6e1ef6432a71c9d0e1331eb573725b4e6ed78595 [diff] | |
| parent | 3fdcf8c3aba616254e1ea65ffbca3af453c70d5b [diff] |
resolve merge conflicts of 3fdcf8c to nyc-mr1-dev-plus-aosp Change-Id: Idaecc3eb0e30ce8e58b79065598d1866739488f8