| commit | 836a4045256b61c0025c3ee3b5d9f66c9f67546e | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Oct 24 22:15:12 2016 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Oct 24 22:15:12 2016 -0700 |
| tree | 12f1e99f7c6436eb62a7eeadb973e41111f573c9 | |
| parent | 9209d6bc16c609451764cc299e34193629845b09 [diff] | |
| parent | 4897bb57e413eba8c7a56390940e8d3a746c81d5 [diff] |
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4