tree 3df13b324209e6ab022e8508522255c975507533
parent 56b53603d996385d5952c67fbf27a87e5201de69
parent 124eb84c5ef018482538fac2912a0fdf29b14567
author Xavier Ducrohet <xav@android.com> 1300214473 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300214473 -0700

am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

* commit '0a98226e3c8cda46786558147a0eb6a56c3370c0':
  Merge 9d76581f from honeycomb. do not merge.