OSDN Git Service

am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
authorElliott Hughes <enh@google.com>
Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)
commit98d9380a5c3c6a6bfa5687af993ea43c882226b9
tree50a8fc4af2f9ff7b241b780914a8555614149da5
parentc53ce26836eccfe9c0bb315d965bc73a9bd7b214
parent680c8c8e43804d9bf69568d4748b3bd3a4aea0ee
am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
  Stop hard-coding sample 12- and 24-hour times.