OSDN Git Service

am 79980b47: am 2482da64: (-s ours) am 90b089de: (-s ours) am b9d6f6f1: (-s ours...
authorSteve Moyer <smoyer@google.com>
Fri, 4 Apr 2014 16:58:48 +0000 (16:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 16:58:48 +0000 (16:58 +0000)
* commit '79980b471453743cff71a4a41609d0a12523c490':
  DO NOT MERGE: Combine emulator test projects into a single apk


Trivial merge