tree cf3de4b88264783c50fe0d3e20c7a219ab626035
parent d0efb6bc159b86dfad540aa9dc3e20e1bb56d930
parent 5180d1c52209f6cd86f2273da6105205c505510a
author Romain Guy <romainguy@google.com> 1265830203 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265830203 -0800

Merge "Prevent infinite loop in the Phone UI."