Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629' * commit '1233e408f77ad8752afa1387a94c8e2b378b6629': Ignore adt/eclipse project files in CustomLocale
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629' * commit '1233e408f77ad8752afa1387a94c8e2b378b6629': Ignore adt/eclipse project files in CustomLocale