OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc7fee9 960d919)
am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)
* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
  Allow proguarding the main app and the test app in a single run.

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

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