am 196926b9: Merge "DO NOT MERGE" into eclair

Merge commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp

* commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c':
  DO NOT MERGE