From: Qiwen Zhao <zhao@google.com>
Date: Wed, 4 Jun 2014 17:12:13 +0000 (+0000)
Subject: am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into... 
X-Git-Tag: android-x86-6.0-r1~445^2~393
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5de36c46d84eeb944646fe5413502f8aabcc76c3;p=android-x86%2Fbuild.git

am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"

* commit 'a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
  Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
---

5de36c46d84eeb944646fe5413502f8aabcc76c3