tree 87a3ed7cf61c68e217eff9b0fa7c53b028e4df6f
parent 981d824acf41af86ab8cec1ac98c1332af89da70
parent b2dba9910b6bcd26d4d5318b9ee63668ecf39e66
author Robert Ly <robertly@google.com> 1308695347 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308695347 -0700

am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2

* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7