[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:09:11 +0000 (11:09 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Nov 2018 19:09:11 +0000 (11:09 -0800)
commit2510d0d22d7e99df67cc74de7fe0c59adafd70d2
treed3201d83805ac24b91cc816c4778af91451c86fe
parentf534ecf88b5d1239b29b1a7d68a31b32a303e652
parente31f01c1e20afc37a29981cf1affa98907dbb26e
[automerger skipped] DO NOT MERGE: Make the tests permissive for Lollipop MR1 am: 7d112535f4  -s ours am: 67fddf713c  -s ours
am: e31f01c1e2  -s ours

Change-Id: Iefca908d69c5bd402494b1d7a97adac5074a8f1d