am 909271c9: Forgotten commit -> apply change.

Merge commit '909271c9b60f755a5298c611400502e7418d161b' into gingerbread-plus-aosp

* commit '909271c9b60f755a5298c611400502e7418d161b':
  Forgotten commit -> apply change.