| commit | 5d409ace19fa1d8d14d099c63f04ba45e4d578a8 | [log] [tgz] |
|---|---|---|
| author | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 11:11:29 2017 -0800 |
| committer | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 11:11:29 2017 -0800 |
| tree | 528cf2bf4c5b8ded47f73adbf5dbda1ecb92aec0 | |
| parent | 068780c052fa02bec3de9fb852ac15742e0832dd [diff] | |
| parent | 81758edffae751c31fb1795febe470c171f7fb1b [diff] |
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88