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

Browse Source

* commit 'af4324cc0ad6fb4d4a7716ebff2421424c4a2292':
  Fix issue #7271589: Cannot set Ocean HD live wallpaper

...

This commit is contained in:

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

parent f05130f1cb af4324cc0a

commit 07f86ae970

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 Not Available