tree 07fba5e025f8c03b7ba9b2f37ca82cc4cec59f0f
parent 5de36c46d84eeb944646fe5413502f8aabcc76c3
parent e8e7ebbde46df2a4dafc4c90a53abd911d1255ec
author Qiwen Zhao <zhao@google.com> 1401906438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401906438 +0000

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

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