tree c991996fb40d49825ba3cf0627a258863d37084c
parent 624782999528b40264c01a054114c14ff4bc0ea0
parent 416dacbe8810b28ffab8e69dec284d9f7cd6b85e
author Daniel Xie <dxie@google.com> 1452901517 +0000
committer android-build-merger <android-build-merger@google.com> 1452901517 +0000

Merge "DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel" into kitkat-cts-dev am: 159f5ac229  -s ours
am: 416dacbe88  -s ours

* commit '416dacbe8810b28ffab8e69dec284d9f7cd6b85e':
  DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel