am a9ac2a46: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'a9ac2a46d1c718cfbe5e15bb1ad78217e236417f':
  Fix NPE in DeviceInfoSettings
  Fix a crash in InstalledAppDetails
  Tweaking mechanism for adding keyguard widgets
  Fix issue #7178865: Selecting an app from Settings > Apps>...
  Must initialize the new atomic..
  Fix crash in Settings > Security

...

This commit is contained in:

The Android Open Source Project

2012-09-20 12:49:00 -07:00

committed by Android Git Automerger

parent 13d7c56a82 a9ac2a46d1

commit bd001f41f7

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