tree 9d045df29264bf6b9720861b1641ade9dbc504f2
parent 017cb1f86d289655af0f3dba8b384673e17523b8
parent c6de4a218d66ddc73b75d4784409b630aeb19ac5
author Andreas Huber <andih@google.com> 1349214270 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349214270 -0700

am 6ffd379c: am 16461dca: Merge "Increase converter polling interval." into jb-mr1-dev

* commit '6ffd379c5ecd6ee4cbde0352067a2eb762ff2c33':
  Increase converter polling interval.