From: Erik Kline <ek@google.com>
Date: Tue, 17 Jan 2017 05:20:52 +0000 (+0000)
Subject: Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770
X-Git-Tag: android-x86-8.1-r1~2121^2~766
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b4f96a3172;p=android-x86%2Fframeworks-base.git

Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770
am: b1d4313777

Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30
---

b4f96a3172a844d9f9f0e5fea80a4a4e75cfb14e