tree 0f980b63213d636b28a7d6b310910b87305eb1c8
parent 888bac9d4f35cb20875e2bb4062f12726fe62dfc
parent d0c3398eb4d3e635a74be63e2bbbb595798b6d1b
author Eric Laurent <elaurent@google.com> 1334801863 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334801863 -0700

am d0c3398e: (-s ours) am e4e3f20f: type definition for future compat.

* commit 'd0c3398eb4d3e635a74be63e2bbbb595798b6d1b':
  type definition for future compat.