| commit | 5b1602d47062b5497d60bfe74ed16acc2393ad7e | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Aug 29 13:05:37 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Mon Aug 29 13:05:37 2016 -0700 |
| tree | e805db01e881735aeb829d042ad8334f22868b4d | |
| parent | 944bb9aec548fc8b037602239200a350325515d8 [diff] | |
| parent | 8c3ddab1c546bcddb9e865a8d404728646d128a3 [diff] |
resolve merge conflicts of 8c3ddab to nyc-mr1-dev-plus-aosp Change-Id: I9d3b742bd28a8f7ca225a43499927b57ebb06d05