OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e28c07 0239220)
am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)
* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
  Bring main.mk in sync with master.

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

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