OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 680e037 b9d6f6f)
am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a...
authorSteve Moyer <smoyer@google.com>
Fri, 4 Apr 2014 16:36:18 +0000 (16:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 16:36:18 +0000 (16:36 +0000)
* commit 'b9d6f6f15c7ea54a55f892654a450fff609b1f5f':
  DO NOT MERGE: Combine emulator test projects into a single apk


Trivial merge
build
About OSDN
Find Software
Develop Software
Help