am 5e883b3b: Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

Browse Source

* commit '5e883b3b37e7203f712174ed46b7a04eb19ea3da':
  Fix Settings app crash for devices with no USB support.

...

This commit is contained in:

David 'Digit' Turner

2014-12-04 16:17:39 +00:00

committed by Android Git Automerger

parent 39ccb47342 5e883b3b37

commit 6a93406b33

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available