| commit | 73021682133ab4586975ccc826769a57403195c7 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Jul 21 12:54:17 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Tue Jul 21 12:54:17 2015 -0700 |
| tree | 151ddb3e5f1d2f92a30f3dc2d743a905f211293c | |
| parent | 28c1081788c1861e552bfd2d93c3f6d83a0f8621 [diff] | |
| parent | 8c25fd565ae9d8a8a3e739bae74b4a374bfe6c85 [diff] |
resolved conflicts for merge of 8c25fd56 to mnc-dr-dev-plus-aosp Change-Id: Id97d2e9d2749bf5739ede583462ef83adb1ee60c