| commit | 4e49d8d43bfab8867f5c2fbeefc41eaf6f9963e3 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed May 31 15:27:25 2017 -0700 |
| committer | sqian <shuoq@google.com> | Wed May 31 15:27:25 2017 -0700 |
| tree | 35f60ee42aad1689ee6239dff17500f929c05278 | |
| parent | d40b89d117a6bd6aa7e2ed17d19b44e7e57f1659 [diff] | |
| parent | 0e50326a404b20c2d3d5e559d8c6385f9c27379f [diff] |
resolve merge conflicts of 0e50326a to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I91fb2abbee5db431e8dc5dbfc8fc9fe0b9179b0c