tree 4edb22fb6ae2ed864cfc345aac718657ba673656
parent a3c2c07e59259f7418940d649692ca7d3580cb72
parent 89bf2239de76f621437021754ea1a90cae8138b0
author Svet Ganov <svetoslavganov@google.com> 1482171745 +0000
committer android-build-merger <android-build-merger@google.com> 1482171745 +0000

Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: 5857a47008" into nyc-mr2-dev-plus-aosp
am: 89bf2239de  -s ours

Change-Id: I5dd4f2ed9033ef754b2a6377dbe8afdcfdcb1e2f