tree df4d577ea602cdb3055f101482f4ade1fb1ff11c
parent 5d2d22221a61258ff7dad29792bbf1201c746e8d
parent 324993abed48843da1cb63063668147151e4db5c
author Elliott Hughes <enh@google.com> 1372461968 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372461968 -0700

am 324993ab: am 5216f11e: Merge "Track libcore API update."

* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.