Commits
Elliott Hughes authored and Android Git Automerger committed a7ac8be1f56M
am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master * commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6': Track libcore API change.
Showing diff to11396cfd6fd