tree 3b34f22fb6766a830ad40bbe0e355dad35248db6
parent b59642bf49e8703ebd88532f06628ef5a7d8b006
parent 837fba984eee8da5badeb2474ca147b8a9911e8a
author Niels Egberts <nielse@google.com> 1431015767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431015772 +0000

Merge "Don't strip country and variant from locale." into mnc-dev