| commit | 524afcec4a2181dc78743ef6038c7878db166430 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Nov 29 15:24:06 2016 -0800 |
| committer | Tom Cherry <tomcherry@google.com> | Tue Nov 29 17:17:26 2016 -0800 |
| tree | 46b3344c2862e7222b5751cae93f905768490768 | |
| parent | 9291de89b9ad9a27cd86292e5928f5c5e9d6fd34 [diff] | |
| parent | 34543c03e6319d102bc0b1e3ca54808ff398e676 [diff] |
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8