| commit | 2db895cba1ba45da375e7940d3e7637fcbedf83a | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Mon Apr 11 13:18:35 2016 -0700 |
| committer | Dimitry Ivanov <dimitry@google.com> | Mon Apr 11 13:18:35 2016 -0700 |
| tree | 349bce19844518d0d4bc0497395a7943c8585c3e | |
| parent | 17eb27a545bb8993c6dc1a1ea77af75fdbf07558 [diff] | |
| parent | 0a48bcc8554a2c07d95753a790684b1889aac9c1 [diff] |
resolve merge conflicts of 663c998 to nyc-dev-plus-aosp Change-Id: I73530375b015a7701acda1c6e0ddb5b4ca6a032c