am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id:...
am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '20f65201':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c