| commit | 27ac0e34fec282656853e5a1be34a20fbe36e3b6 | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Thu Sep 29 14:24:30 2016 -0400 |
| committer | David Zeuthen <zeuthen@google.com> | Thu Sep 29 14:25:03 2016 -0400 |
| tree | f2ad771d16b6daf1f15f5c851efe654b641dbf13 | |
| parent | dc7706a8ad4988c183f061a590254a584800dd71 [diff] | |
| parent | c36ab42dccad8de3903367ebed4e9dcf7f6ce99d [diff] |
resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb