OSDN Git Service

am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
authorElliott Hughes <enh@google.com>
Tue, 28 Oct 2014 04:39:24 +0000 (04:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Oct 2014 04:39:24 +0000 (04:39 +0000)
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.

1  2 
core/java/android/widget/TextClock.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java