OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b015180 30f71ce)
am f7896449: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 23:00:01 +0000 (16:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 May 2010 23:00:01 +0000 (16:00 -0700)
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown


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