OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 400988b a697268)
am a6972684: am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl"
authorSelim Gurun <sgurun@android.com>
Fri, 25 Apr 2014 00:52:37 +0000 (00:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 00:52:37 +0000 (00:52 +0000)
* commit 'a697268442a68fef255863f0a8a0fa1a610dc340':
  Add a stub to fix master-gpl


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help