| commit | d4e38524c3a252204113c12322f9e4b8e765622d | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Mon May 09 12:58:54 2016 -0700 |
| committer | Dimitry Ivanov <dimitry@google.com> | Mon May 09 12:58:54 2016 -0700 |
| tree | 22ce40c4ea4e69d77a6475f043557a70993f3b3b | |
| parent | 8d3f5c395dc2dd27ddd0478d1842ae736073f38e [diff] | |
| parent | 1a3ac02e4c765c54577233662d121c02f4fc919d [diff] |
resolve merge conflicts of 1a3ac02 to nyc-dev-plus-aosp Change-Id: Ia658c3dfd2cc5f19977ae48d9a3d543dd6faa01a