tree dacda19d3869843eba29e24e7f07a1b3f8c2918e
parent 11396cfd6fd03a72569046b02715455ea0bb186d
parent dff4ec87e7b942b7b4410f639fc74c2cffb386d6
author Elliott Hughes <enh@google.com> 1373563006 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373563006 -0700

am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.