tree 09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parent 88e35b82c02de4507799f51c9db9cf20a36c5892
parent 55383fdaa7e8191eb711fac6182d2fa744426098
author Robert Ly <robertly@google.com> 1330639846 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330639846 -0800

am 941ff38d: Merge "fix bug 5942522" into ics-mr1

* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522