tree 83baddf11e60cb2b8d17bec31c97bfb8bd35b456
parent f838ce5b892680f7b7bc2e607bf19cad242da028
parent 3c0c192cdfc960165151fd305241b527736e9387
author Michael Jurka <mikejurka@google.com> 1320966124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320966124 +0000

am 3c0c192c: Merge "resolved conflicts for merge of b9c76f32 to ics-mr1" into ics-mr1

* commit '3c0c192cdfc960165151fd305241b527736e9387':
  resolved conflicts for merge of b9c76f32 to ics-mr1