| commit | 9856bfbc9ade29dd255413e56314cfb0956c7af3 | [log] [tgz] |
|---|---|---|
| author | Ningyuan Wang <nywang@google.com> | Tue Oct 11 20:55:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 11 20:55:31 2016 +0000 |
| tree | 49a818003c3f28d92e250e1878f4c8e51cbc979d | |
| parent | f92312f5815f35c28b7f4b77d1b364d3127e503a [diff] | |
| parent | 8851f93e19f13516f20eab29ae685911fc9b390d [diff] |
resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d am: e61906f92c am: 8851f93e19 Change-Id: I9ff8deb5f9eda801c10e1ec5d4a777db4390aae6