OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb1ccc7 a0a6d2c)
am a0a6d2c5: (-s ours) am 53c38c88: Merge "Revert "Create a special CONSTRAINED font...
authorRoozbeh Pournader <roozbeh@google.com>
Thu, 27 Aug 2015 10:38:38 +0000 (10:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:38:38 +0000 (10:38 +0000)
* commit 'a0a6d2c5d6e4214f407911667ad2b6004fcfe2c7':


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