Merge change Ie3124796 into eclair

* changes:
  Ignore adt/eclipse project files in CustomLocale