tree 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad
parent 02235c39040120295314a402841b17f68752ec99
parent 2ef89309d41daac3d69fa78b31cd09cb2c262ca1
author Jean-Baptiste Queru <jbq@google.com> 1296320267 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296320267 -0800

am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp

* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
  Fix issue 2988031.