OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ca25da 2664e5f)
am 2664e5f0: (-s ours) am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE...
authorSteve Moyer <smoyer@google.com>
Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)
* commit '2664e5f02c79c18a1286fde0454f98361d08d42c':
  DO NOT MERGE: Combine emulator test projects into a single apk


Trivial merge
build
About OSDN
Find Software
Develop Software
Help