tree e1d11d74085cb10892f2b4b5e8ceb4cbc624616a
parent 9b8178719b4ff9058ddcc1c66e9416439b2348f0
parent 70392818f07f175d4914cef13b12c215ff08f1df
author Narayan Kamath <narayan@google.com> 1428412091 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428412098 +0000

Merge "Don't set userSetLocale from Configuration.setLocale."