tree c6fb5e7d1363af5db3f3df713bf94f9e4944c176
parent fabf86f788260b19ae59e472843164c3bf44e259
parent 44eb0968d0d5042c03007d95544c1b405ff7e121
author Eric Laurent <elaurent@google.com> 1283205888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283205888 -0700

am ae6bdc23: Merge "Fix issue 2952766." into gingerbread

Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.