| commit | 94ab88228e15b0554179d476f05c0febe4da218d | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Dec 28 10:49:04 2015 -0800 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Dec 28 10:49:04 2015 -0800 |
| tree | f9f8c21c60bc9d1f4e8c9fb1dc69035d8d413f36 | |
| parent | 6556921a1edbddea64b54415967b2bacbb7bf456 [diff] | |
| parent | f3cc23524fddcc2d55d17747a901b2090773e429 [diff] |
resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp. Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00