am 815b1eb8: (-s ours) am 1c2911a6: Merge "Fix bug 3061769" into gingerbread

Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846'

* commit '815b1eb870ea5b1d28de5be768d49e95c776c846':
  Fix bug 3061769