am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do...
am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '67f09cd0':
Cherrypick d1ed33c4 from hc-mr1. do not merge.