OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf12a80 1737d98)
am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerSer...
authorDianne Hackborn <hackbod@google.com>
Tue, 1 Feb 2011 01:58:08 +0000 (17:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Feb 2011 01:58:08 +0000 (17:58 -0800)
* commit 'b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
  Do not check features in PackageManagerService DO NOT MERGE


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