| commit | 4c39b9c74224782a6ceb299554f4abc9e1cf5733 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 27 11:38:26 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri May 27 11:38:26 2016 -0700 |
| tree | 36615ae0cfaa565987875be2995d528d5445317f | |
| parent | f69feffd84bc736a8cdee7902bfcf988409af7c1 [diff] | |
| parent | 9764d5292bcd936ff2442de69371913f88489189 [diff] |
resolve merge conflicts of 9764d52 to nyc-dev-plus-aosp Change-Id: I52d001d9dff4b250769e5fa59f9aea461b435193