| commit | d260be38c647792b4318443f22da3cffc74b5918 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:32:10 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 16:32:10 2015 -0700 |
| tree | fcb03dfc3cc1543584b7637c15b2307acffe0210 | |
| parent | 7da270df1d020c8b1ebcd636ae090d1edc1f7e89 [diff] | |
| parent | 486645ee43de7be375a1150754a72798aaeb645b [diff] |
resolved conflicts for merge of 486645ee to mnc-dr-dev-plus-aosp Change-Id: Ia7fbfc56f01b683e4e4870b3952fe2af32962123