tree 28102e985273ca72e4ac4ccfff746a09d9f5a278
parent 67e9e9df929aad9139f1dc776b15f6c5d64f424e
author Romain Guy <romainguy@android.com> 1265830162 -0800
committer Jim Miller <jaggies@google.com> 1266470196 -0800

Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Prevent infinite loop in the Phone UI.