OSDN Git Service

am c653faa8: (-s ours) am 37773821: (-s ours) DO NOT MERGE: Combine emulator test...
authorSteve Moyer <smoyer@google.com>
Wed, 4 Jun 2014 17:28:52 +0000 (17:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 17:28:52 +0000 (17:28 +0000)
* commit 'c653faa88717b0ca5e97b39a4016399d7a67549f':
  DO NOT MERGE: Combine emulator test projects into a single apk


Trivial merge