am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the layout directory"

* commit '4647c4c78efef4d096c11b1a2424ef49813d6ded':
main
Ken Wakasa 2013-09-26 05:24:12 -07:00 committed by Android Git Automerger
commit 87dfe42d54

Diff Content Not Available