| commit | 2d9a305179c958b78482b9a12c9410020bc795da | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Dec 07 05:20:15 2016 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Wed Dec 07 05:20:25 2016 -0800 |
| tree | 8466d2aaa6073e40f248e09cc2c2d5fa41f8d876 | |
| parent | 5aec970460314541901daa9b201bb4014edc07e0 [diff] | |
| parent | 58f94539a2b8364615f71691075a956c87294b19 [diff] |
resolve merge conflicts of 48d4fe1 to nyc-mr1-dev-plus-aosp Test: Android compiles. Change-Id: Ibee3f2dae93e9d1bc7171588c1aa41b53e177687