OSDN Git Service

Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_L...
authorFabrice Di Meglio <fdimeglio@google.com>
Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 15:36:02 +0000 (15:36 +0000)
commit6cef9d23b8572d8bd87329999f10286e29a861c0
tree53d366cc4d05d7b9b4efcd883f7e08526e967e79
parent468d39160fd417cf23cba3d592acb349d3f59c55
parente3ff4d8e92a19473c622c1d46b30c63bf2d001d0
Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
AndroidManifest.xml
src/com/android/settings/Settings.java
src/com/android/settings/SettingsActivity.java