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

Change-Id: I0c2837dcf5546e5f04bf7f5f9014422944aa443a