| commit | d8aee77a6c48b00ecbc4c1f9113252d742ba244a | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 15:55:40 2016 -0700 |
| committer | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 15:55:40 2016 -0700 |
| tree | f21d039e4ea3e32bd41fae31a9ca4cc4b430eeb5 | |
| parent | 9f2c0ffaf53742612a3dd7cc9415a5aff17f214a [diff] | |
| parent | b2ed83301e3df782c2c3985dcf7eefeb15ec941a [diff] |
resolve merge conflicts of a742d10 to nyc-dev-plus-aosp Change-Id: Icf3257ee8a47f31ba812a5f47899b8022f4eedb7