tree a3925b12a2db6fb7d5b5235de4de6a7dce52a191
parent 767036385066ebd03fbd960c65de334977227016
parent db9fe5ce77195d1943c429e4adfb380b90afb853
author Keyvan Amiri <keyvana@google.com> 1501700018 +0000
committer android-build-merger <android-build-merger@google.com> 1501700018 +0000

Merge "Fixed localization formatting for picker widgets" into oc-support-26.1-dev
am: db9fe5ce77  -s ours

Change-Id: I099e9e5052eace16f0ae684c054a5a8e8501d090