| commit | bd7bd1be80f5baca04bb4e4594df1c84e6e0658d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Dec 07 05:24:58 2016 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Wed Dec 07 05:25:04 2016 -0800 |
| tree | 8466d2aaa6073e40f248e09cc2c2d5fa41f8d876 | |
| parent | fba95e105b0130f0d054fd007d6b26ac54073b6c [diff] | |
| parent | a71003da666b9d36f09137e8bae11d841705d0e5 [diff] |
resolve merge conflicts of a71003d to nyc-mr2-dev-plus-aosp Test: Android compiles. Change-Id: Ifa47225939dc6f59890b5c5fd1584547c09605a6