| commit | 47734c9509ecb472c2844cae46e2d916b9358321 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon May 02 12:23:44 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Mon May 02 12:23:44 2016 -0700 |
| tree | 6b17e7f1540458e2f1abbe1c082353f920edc3df | |
| parent | 20be7bf5ba6f3d4db36686d5af4316006cf9bb27 [diff] | |
| parent | 98a9b2a491360c762e2ed46a9126f576693645a5 [diff] |
resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp Change-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a