tree cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b
parent 8d54f983ba0204062d775347e61f80b1d5992d7a
parent 03f2861caec5b0811d9148c92fc9b1b740f684dd
author Xavier Ducrohet <xav@android.com> 1306171317 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306171317 -0700

am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
  Merge 05b7b69c from honeycomb-mr1. do not merge.