[automerger skipped] DO NOT MERGE: Make the tests permissive for Lollipop MR1 am...
authorrie kanazawa <rie.kanazawa.sd@kyocera.jp>
Wed, 21 Nov 2018 19:29:45 +0000 (11:29 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Nov 2018 19:29:45 +0000 (11:29 -0800)
commitb99352ecbca03d731c639ab0c943d27f00338b49
treed84b5ec633503dc9df5c868ac35b255edfb9ff18
parent2079615c031bbf3ec4ec18b078d1c6def9012bdf
parent6bb25b4e2a4832e8ffcf2703b4d3f5badb133b18
[automerger skipped] DO NOT MERGE: Make the tests permissive for Lollipop MR1 am: 7d112535f4  -s ours am: 67fddf713c  -s ours am: e31f01c1e2  -s ours am: 2510d0d22d  -s ours am: 151cae7dfb  -s ours
am: 6bb25b4e2a  -s ours

Change-Id: I276fc018922f87d1dce48fd405b65c43294554cb