tree cfbfb1ce010143ec3a4283c9d9643eb836b46ad0
parent 144f7c2da98ee622d3a294436e22b28e8008f196
parent 3d54e74bc450bb40977e3ae6fab6185fe687bdae
author Wink Saville <wink@google.com> 1242716171 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242716171 -0700

am 3d54e74b: Teleca 2b changes.

Merge commit '3d54e74bc450bb40977e3ae6fab6185fe687bdae'

* commit '3d54e74bc450bb40977e3ae6fab6185fe687bdae':
  Teleca 2b changes.