tree 47c92871b36c4444d8584a7a7be3909d805311ed
parent 6665c3f1487a69816521e3b18eaa8be4d847bcbc
parent 22769993a1e8511af84c49161c0f032475023a48
author Makoto Onuki <omakoto@google.com> 1326929894 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326929894 -0800

am 22769993: am 939532e0: am 80dec847: Merge "Cherry-picking I25bf497e for MR1" into ics-mr1

* commit '22769993a1e8511af84c49161c0f032475023a48':
  Cherry-picking I25bf497e for MR1