tree c0c8eadec44cc85c0d00ee563b06a406e8eb7638
parent 835d2b641a39ff2173f36b39ddd4681f3a04e208
parent 2510d0d22d7e99df67cc74de7fe0c59adafd70d2
author rie kanazawa <rie.kanazawa.sd@kyocera.jp> 1542827656 -0800
committer android-build-merger <android-build-merger@google.com> 1542827656 -0800

[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

Change-Id: Ieb354df86d75ab4cbbf657d2c73bf296dc98084c