tree a7502118c6abd0c1aa64eba593b5e63aba3715fa
parent 5f9fd46d006823133b2ebfd5809649025b8d7434
parent c8f07bae1fb0a690d95008e18797aaefd58c4f62
author Xavier Ducrohet <xav@android.com> 1300404307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300404307 -0700

am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.

* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
  Merge 67450db0 from honeycomb. Do not merge.