am 3a899b85: am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread

Merge commit '3a899b85102f6d51585b3d46ced3038c8602f202'

* commit '3a899b85102f6d51585b3d46ced3038c8602f202':
  Fix issue 2929440