Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." am: b1bf1cd066
am: ff92741c16
* commit 'ff92741c1625904e746747fe9f3eefe954c8e98c':
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
This commit is contained in: