tree 24f40ed55650b0e5d20aba3a100a1fc66b658122
parent 5eff61f1d1a9fa5080d5923f42e18c5425948a6d
parent 2eb49ff2a3f7066cae1768d2314c4f912bd6c28d
author Romain Guy <romainguy@android.com> 1243928166 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243928166 -0700

am 2eb49ff2: Fixes #1889268.

Merge commit '2eb49ff2a3f7066cae1768d2314c4f912bd6c28d'

* commit '2eb49ff2a3f7066cae1768d2314c4f912bd6c28d':
  Fixes #1889268.