tree 3dbc45456da9aed773d2e58ee45cb0e88458a260
parent 7942b33e8905bbc177ff3c92596404530c860bcd
parent 28359cc7512420bf05fd202d6b4766bc32abe85e
author Dmitri Plotnikov <dplotnikov@google.com> 1268961482 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1268961482 -0700

Merge "Cleaning up list of common nicknames"