| commit | 71e159ed5aaaf62458822dd4dc6bd7e1cad3d63e | [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 | 9195943d9d66bf2bdb5ded0c417ce108a30c20d5 [diff] | |
| parent | 881803f971d23d31d49588ded4303a72fe195564 [diff] |
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4