am c4cdd59e: (-s ours) Reconcile with klp-release - do not merge

Browse Source

* commit 'c4cdd59e025e574a78c47bb6db83b31e46e66b04':
  Fix bug when sharing to bluetooth.
  Fix for TTS settings crash.
  Restriction pin changes.
  Remove Restrictions UI
  Add some missing fragments to the whitelist
  Potential fix for Settings instability on x-large.
  Fix accidental creation of restriction entry for required apps
  Fix broken strings in Settings
  Always allow formatting of physical storage.
  Guard against missing terminal app.

...

This commit is contained in:

The Android Open Source Project

2013-08-14 14:30:02 -07:00

committed by Android Git Automerger

parent 49583c9362 c4cdd59e02

commit 741b2b94c3

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