tree 2316615a836500c1e7b629b83cdef86f5ee3cc23
parent 4989fbeca7d66c6544cd030cfc4b0c312e4c050f
parent 2267e70cb374f0feff81db6ffdc67d6089da2f9f
author Vasu Nori <vnori@google.com> 1272419834 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272419834 -0700

am 6813f8d2: am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo