| commit | 97069b07c39e29c2a784c5636730bd3681847b07 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Tue Apr 12 13:06:20 2016 -0700 |
| committer | Guang Zhu <guangzhu@google.com> | Tue Apr 12 13:06:20 2016 -0700 |
| tree | 82eeadfa05f464b70c97d8fb4e445ad7a128578a | |
| parent | 748ea8acb07d727c18002058b8a07cf2f5861631 [diff] | |
| parent | bc3720c69572391b7fbd9e2cf30a667ec1cc37e6 [diff] |
resolve merge conflicts of bc3720c to nyc-dev-plus-aosp Change-Id: I2372a61a39131ede33cda95afc3c3ddd19e542f0