| commit | 635821159fc12f29d25d7e5a80577bea22f509c3 | [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 | 4fc313391f8f4de90b43ff79a28f9ee34c6a60c9 [diff] | |
| parent | 1c8f4b17883b5e57c2bd75abc6ba2e5d85889aaa [diff] |
resolve merge conflicts of a71003d to nyc-mr2-dev-plus-aosp Test: Android compiles. Change-Id: Ifa47225939dc6f59890b5c5fd1584547c09605a6