tree a71286416890b7bb9d974235a31dd2fef913fe40
parent 137bd30c55457f294f0f816cee2f4cb3cefb28b4
parent 4047070332595e52b89076d4149e457442b3f03f
author Brad Fitzpatrick <bradfitz@android.com> 1412706413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412706413 +0000

am 40470703: am f5a1aa19: am 933b3540: (-s ours) Misc StrictMode test app additions and fixes.

* commit '4047070332595e52b89076d4149e457442b3f03f':