am 4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Browse source

* commit '4fdf09c3103074770675b40c9fb5e47c04617c61':
  Fix encryption on certain devices

...

This commit is contained in:

The Android Open Source Project 2012-10-10 09:48:04 -07:00 committed by Android Git Automerger

parent 1f5205e5d2 4fdf09c310

commit 5806aedff0

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available