Elliott Hughes 105d879cce am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master ...

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

2012-09-06 16:39:41 -07:00

..

arrays.xml

Revert "Import translations. DO NOT MERGE"

2012-09-06 11:15:52 -07:00

strings.xml

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

2012-09-06 16:39:41 -07:00