OSDN Git Service

am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for...
authorElliott Hughes <enh@google.com>
Mon, 18 Mar 2013 22:24:31 +0000 (15:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Mar 2013 22:24:31 +0000 (15:24 -0700)
* commit '6317315e733f115aa6ad0339c1a334607fd04342':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.


Trivial merge