tree 5dbf0392571a64b4afbe0ba73655c889f650eb75
parent 1c10ff34b51637155b234703100b82ed9e1ba947
parent 1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9
author Doug Zongker <dougz@android.com> 1241810571 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241810571 -0700

am 1c4ceae: undo temporary alignment hack

Merge commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9'

* commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9':
  undo temporary alignment hack