OSDN Git Service

am 2482da64: (-s ours) am 90b089de: (-s ours) am b9d6f6f1: (-s ours) Merge "DO NOT...
authorSteve Moyer <smoyer@google.com>
Fri, 4 Apr 2014 16:50:47 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 16:50:47 +0000 (16:50 +0000)
commit79980b471453743cff71a4a41609d0a12523c490
tree26e6a5c39ddaa3a2468977f929c47d3973654871
parent8cc491cff3e4e1bf0d007d592c3db087cc26ec5c
parent2482da64f875566a4a0bf30ac2a45ed860efeb1d
am 2482da64: (-s ours) am 90b089de: (-s ours) am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"

* commit '2482da64f875566a4a0bf30ac2a45ed860efeb1d':
  DO NOT MERGE: Combine emulator test projects into a single apk