am 34476d02: am a005d09d: Merge "Fix prefs.xml"

* commit '34476d02052ddb3129510a0c6ddf8d28486b0db5':
main
Tadashi G. Takaoka 2013-09-26 05:53:12 -07:00 committed by Android Git Automerger
commit 7ec236d6bd

Diff Content Not Available