Merge "Update Eclipse plugin to handle new LocaleQualifier API" into...
Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1.2-dev automerge: 9042534a
automerge: 05cde4d4
* commit '05cde4d4':
Update Eclipse plugin to handle new LocaleQualifier API