OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecd8679 e32d00a)
am e32d00aa: (-s ours) am 519adb50: Merge "Create a special CONSTRAINED font bucket...
authorRoozbeh Pournader <roozbeh@google.com>
Thu, 27 Aug 2015 10:00:10 +0000 (10:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:00:10 +0000 (10:00 +0000)
* commit 'e32d00aae61a94fab60caae8f8c477d5dea4022a':


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