tree 79a9cf3d87b48ea24e3916bf95be74b6b95b7975
parent 28d8b8c9882e501f95ec3076a4f1fffc759ea999
parent af588a31bc62b791014b3cc4e655107e9446e3d0
author Jeff Sharkey <jsharkey@android.com> 1449162823 +0000
committer android-build-merger <android-build-merger@google.com> 1449162823 +0000

Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks