tree 8a2b1e15f5011bdfab1d53b2f950bc0cc68be44b
parent 2fde0e640aa46ac2875b48fe6b9d570c209e57f4
parent 35733757bd1644f1fd67dc3a055391d1f167c4f2
author Android (Google) Code Review <android-gerrit@google.com> 1244807973 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1244807973 -0700

am 35733757: Merge change 3935 into donut

Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2'

* commit '35733757bd1644f1fd67dc3a055391d1f167c4f2':
  Hook the 12- or 24-hour time format checkbox back up.