tree 8e4f8833f263c9fbab6595135a55fe8f0a24169c
parent 408480b27c1feff75ad5957de61fc7c51c05dad8
parent e8e035aaaa83d190b616429a28a981353648b32a
author Adam Vartanian <flooey@google.com> 1541686677 -0800
committer android-build-merger <android-build-merger@google.com> 1541686677 -0800

Merge "Update API file for libcore additions" am: 07160ff7e5 am: 2d67c19860
am: e8e035aaaa

Change-Id: I7a22c36c3b1f9238cfe89f95b4e0d148030c8dc1