| commit | 20cb827ac527bb3f62e6009470ad0d595240807e | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Apr 25 13:53:25 2016 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Mon Apr 25 13:57:41 2016 -0700 |
| tree | 3bbe226dd914aaf281c3b6cf6d173fe501223a8b | |
| parent | 0f75d202d4c2f8bc190e5356fd00073363a76845 [diff] | |
| parent | 89c03a36e2edba3780800d4a45faa0d9998c4097 [diff] |
resolve merge conflicts of 89c03a3 to nyc-dev-plus-aosp Change-Id: Iadc9712436524303be184c60a622ef79f0efb3e7