| commit | ae684f09dcd2ff8e7be5db425ce8572fb9448d6b | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Thu Feb 25 11:50:13 2016 -0800 |
| committer | Dimitry Ivanov <dimitry@google.com> | Thu Feb 25 11:50:13 2016 -0800 |
| tree | 6904e91ed7ad77b66ee17f129e0911e8d7b54072 | |
| parent | 6c0cd9795f316b7afb5e4ffdba5f5ac2651a6eb0 [diff] | |
| parent | 7f849c2cd299cbcaebdb1bc099b1f056401975c1 [diff] |
resolve merge conflicts of 7f849c2cd2 to nyc-dev-plus-aosp Change-Id: Ibf73d0aae812c51a4d9799dc646847044e8b226a