OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d985ff bd555f1)
am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master
authorYing Wang <wangying@google.com>
Tue, 4 Aug 2015 20:44:58 +0000 (20:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 20:44:58 +0000 (20:44 +0000)
* commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1':
  Ignore .*.java files when collecting .java files.

1  2 
core/definitions.mk patch | diff1 | diff2 | blob | history

diff --cc core/definitions.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help