tree ad38c66a1871aea9d8f707a293d94fd07afb8094
parent 2b89bd17e4bb19602146b3fd8cc643c01257a591
parent e66414f7df8c6fe9eccdee87d112d96d8103d8ce
author Dianne Hackborn <hackbod@google.com> 1295049742 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295049742 -0800

Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb