tree e7cb9f712a46c677dd172ef89070a8d7f1e6192a
parent b2ac49918672f66b71111895cf460e85648b587f
parent 5c96ddaa688e32f237f34275bc271016a17e0e15
author Eric Fischer <enf@google.com> 1285694380 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285694380 -0700

Merge "Rename search_engines.xml to keep translation imports from overwriting it." into gingerbread