| commit | 1398e8e5aa9766722d9842feb7254c1117e60162 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Sat Jul 30 12:48:07 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Sat Jul 30 12:48:07 2016 -0700 |
| tree | 7914f1f929af3cb50bfa7cee9616957b861e7439 | |
| parent | 1e405a416d160a617838b8fedd78a96116d2a048 [diff] | |
| parent | 20a35b6728d6295ebf3c47bf4b0e34af99a37610 [diff] |
resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp Change-Id: Idd5fb6b64120af303a2987c7449e59face7d77be