| commit | 2086b824e51b78a98264a80bc72e6fd6a3c25f65 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Mar 08 08:43:04 2016 -0800 |
| committer | Sami Tolvanen <samitolvanen@google.com> | Tue Mar 08 08:43:04 2016 -0800 |
| tree | d3f2f3205df370a76c8cc1c7ccf75bd25b5f43de | |
| parent | 1682993719599f8c4af2be90673be8ae1e38e19b [diff] | |
| parent | 1dcf295912451ae307f13938b0aeb294e90dda95 [diff] |
resolve merge conflicts of 9c41490ca7 to nyc-dev-plus-aosp Change-Id: I5638606f8c59d33898efa184e349a2f818381c4d