OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 802aaf3 8e21e21)
am 8e21e215: Merge "Switch from core to core-libart"
authorBrian Carlstrom <bdc@google.com>
Thu, 19 Jun 2014 02:03:35 +0000 (02:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Jun 2014 02:03:35 +0000 (02:03 +0000)
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart

1  2 
tools/layoutlib/Android.mk patch | diff1 | diff2 | blob | history

diff --cc tools/layoutlib/Android.mk
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help