OSDN Git Service

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


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