am 0ce5a41c: am 8d1ff3a4: Merge change I77153ee0 into eclair

Merge commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833'

* commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833':
  Hide zoom api.