OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2010e78 0a8aaaf)
am cedcdc98: (-s ours) am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML...
authorMarc Blank <mblank@google.com>
Thu, 23 Feb 2012 15:28:54 +0000 (07:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 15:28:54 +0000 (07:28 -0800)
* commit 'cedcdc984cf36d3b3aeca359b4866e5680427c51':


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