From: Elliott Hughes <enh@google.com>
Date: Thu, 6 Sep 2012 23:39:41 +0000 (-0700)
Subject: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp... 
X-Git-Tag: android-x86-4.4-r1~634^2~3^2~229
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=105d879ccef2517a07a15f29b956be739504fa73;p=android-x86%2Fpackages-apps-Settings.git

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.
---

105d879ccef2517a07a15f29b956be739504fa73