am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp...

* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
  Stop hard-coding sample 12- and 24-hour times.

diff --cc res/values-af/strings.xml
Simple merge

diff --cc res/values-am/strings.xml
Simple merge

diff --cc res/values-ar/strings.xml
Simple merge

diff --cc res/values-be/strings.xml
Simple merge

diff --cc res/values-bg/strings.xml
Simple merge

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-et/strings.xml
Simple merge

diff --cc res/values-fa/strings.xml
Simple merge

diff --cc res/values-fi/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-hi/strings.xml
Simple merge

diff --cc res/values-hr/strings.xml
Simple merge

diff --cc res/values-hu/strings.xml
Simple merge

diff --cc res/values-in/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-iw/strings.xml
Simple merge

diff --cc res/values-ja/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-lt/strings.xml
Simple merge

diff --cc res/values-lv/strings.xml
Simple merge

diff --cc res/values-ms/strings.xml
Simple merge

diff --cc res/values-nb/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-pt/strings.xml
Simple merge

diff --cc res/values-rm/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-sk/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-sw/strings.xml
Simple merge

diff --cc res/values-th/strings.xml
Simple merge

diff --cc res/values-tl/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-vi/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc res/values-zu/strings.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge