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

* commit '7ec236d6bdcfac8141572e918c08774062e9b1d2':
main
Tadashi G. Takaoka 2013-09-26 07:34:28 -07:00 committed by Android Git Automerger
commit 2b0d686cba

Diff Content Not Available