tree ce593448d50c21de80b0e9113f2b9b682ee06398
parent f79757bfafa05299410924c710c0798a0b511443
parent 2693152ec0f8cf808a0669828d361fb4033008a5
author Elliott Hughes <enh@google.com> 1343712713 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343712713 -0700

am 2693152e: am 2717cf1d: am bea985eb: am b31d2a6b: Merge "Fix cmp documentation."

* commit '2693152ec0f8cf808a0669828d361fb4033008a5':
  Fix cmp documentation.