tree 712d14724e1e298538ed96eb951614db8135fbe7
parent 9de3bf0d4b747453705eee7cf09008538c2e665c
parent b2ea49c925176efdc98faa4f2ed5729e70aefbc1
author Daniel Xie <dxie@google.com> 1460872190 +0000
committer android-build-merger <android-build-merger@google.com> 1460872190 +0000

Merge "Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423  -s ours" into lollipop-mr1-cts-dev
am: b2ea49c  -s ours

* commit 'b2ea49c925176efdc98faa4f2ed5729e70aefbc1':
  DO NOT MERGE: Disable CVE 2015_3826 test

Change-Id: I4821241876c3e338eb695cd7f1612c48a3ecc765