tree 489da500032e9c41ea86341ce5fbafc8da65ae10
parent 6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026
parent a362e1d79492cf3a60724a259fcd6d786574d5d6
author Makoto Onuki <omakoto@google.com> 1283895094 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283895094 -0700

Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread