Elliott Hughes 001d145610 am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master ...

* commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194':
  Stop hard-coding sample 12- and 24-hour times.

2012-09-06 16:43:46 -07:00

..

arrays.xml

Revert "Import translations. DO NOT MERGE"

2012-09-06 11:16:03 -07:00

strings.xml

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

2012-09-06 16:43:46 -07:00