diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:36 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:36 +0100 |
| commit | 6ce3a9ad00160cd58574b6bca6d2220c4dbfc83e (patch) | |
| tree | bd4c283a39b6659d25c49870a045ff73b049eebc /cpp/include/libaddressinput/address_ui.h | |
| parent | b8347ad8ead685b8afe0ff329ae047f17c7b817c (diff) | |
| parent | f7ddeee545f03c948074c921c4648807d90227ae (diff) | |
| download | src-l-preview.tar.gz | |
Merge from Chromium at DEPS revision 278856android-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-preview
This commit was generated by merge_to_master.py.
Change-Id: I283eef90c15d40ea8cd6290f12094fc152a2c45e
Diffstat (limited to 'cpp/include/libaddressinput/address_ui.h')
| -rw-r--r-- | cpp/include/libaddressinput/address_ui.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/include/libaddressinput/address_ui.h b/cpp/include/libaddressinput/address_ui.h index 8939501..cc39f6a 100644 --- a/cpp/include/libaddressinput/address_ui.h +++ b/cpp/include/libaddressinput/address_ui.h @@ -29,7 +29,7 @@ const std::vector<std::string>& GetRegionCodes(); // Returns the UI components for the CLDR |region_code|. Uses the strings from // |localization|. The components can be in default or Latin order, depending on -// the language of |localization|. +// the BCP 47 |ui_language_tag|. // // Sets the |best_address_language_tag| to the BCP 47 language tag that should // be saved with this address. This language will be used to get drop-downs to @@ -40,6 +40,7 @@ const std::vector<std::string>& GetRegionCodes(); std::vector<AddressUiComponent> BuildComponents( const std::string& region_code, const Localization& localization, + const std::string& ui_language_tag, std::string* best_address_language_tag); } // namespace addressinput |