tree 7f92283f167b9075f1b6ab9aaea9871b7096fac8
parent bd856a5516503302ba1f1fdd4317cc12c25c65b3
parent 9544df0767b7e3e7d9f807cb2290cd3afba73b7a
author Elliott Hughes <enh@google.com> 1372723291 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372723291 -0700

am 9544df07: am e88fe7f4: am 94fed1c5: Merge "Track libcore API update."

* commit '9544df0767b7e3e7d9f807cb2290cd3afba73b7a':
  Track libcore API update.