[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:19:19 +0000 (11:19 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Nov 2018 19:19:19 +0000 (11:19 -0800)
commit6bb25b4e2a4832e8ffcf2703b4d3f5badb133b18
treef8d16a96a187b09fd71431d326db7ff8d4c9dbdf
parentf218ba9a91d7db809bcae4a7243cf369a264a518
parent151cae7dfb497aca4133a27ac0f0eaea7d8f27da
[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

Change-Id: I9e4e516939407b1913cee168032d44b28ca766de