OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3c6faa d03c38e)
am d03c38e7: (-s ours) am e19b76cb: Merge "Add more examples of generating/importing...
authorAlex Klyubin <klyubin@google.com>
Thu, 27 Aug 2015 10:19:24 +0000 (10:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:19:24 +0000 (10:19 +0000)
* commit 'd03c38e7041759dda3c11fc26c691661cfbe8e8b':


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