From: Sundeep Ghuman <sghuman@google.com>
Date: Tue, 1 Aug 2017 23:15:30 +0000 (+0000)
Subject: Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
X-Git-Tag: android-x86-9.0-r1~410^2~3^2~86
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4150fbacc8a6672391a59e11fb6cc0a31277604c;p=android-x86%2Fframeworks-base.git

Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
am: dbb97833c6

Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74
---

4150fbacc8a6672391a59e11fb6cc0a31277604c