| commit | 6a93406b33bab8346b01aa3f0b8f2b1317d12d49 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Dec 04 16:17:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 16:17:39 2014 +0000 |
| tree | f31d3f6e492992bbe24604c5dcb795f7d43ce335 | |
| parent | 39ccb47342eb4d40fad889fabe03771d959b946c [diff] | |
| parent | 5e883b3b37e7203f712174ed46b7a04eb19ea3da [diff] |
am 5e883b3b: Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp * commit '5e883b3b37e7203f712174ed46b7a04eb19ea3da': Fix Settings app crash for devices with no USB support.