OSDN Git Service

Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices...
authorFabrice Di Meglio <fdimeglio@google.com>
Fri, 8 Aug 2014 19:35:06 +0000 (19:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Aug 2014 17:26:08 +0000 (17:26 +0000)
commit09076e5f3c90dbc1a3bdf6f000e0c99dd2bb45b4
tree6dcf9a99b58418c262a22c2f48c577f967bddac8
parentdc16286ff32dfc4d087938461d0beca29b6167a3
parent22a2a49b445b8721c8194eedf3608ea81c62ccef
Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev
src/com/android/settings/SettingsActivity.java
src/com/android/settings/Utils.java
src/com/android/settings/sim/SimSettings.java