OSDN Git Service

am 5886050f: Merge change I0d8f7593 into eclair
authorDianne Hackborn <hackbod@google.com>
Wed, 2 Dec 2009 13:26:12 +0000 (05:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 13:26:12 +0000 (05:26 -0800)
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op

1  2 
api/current.xml
core/res/AndroidManifest.xml

diff --cc api/current.xml
Simple merge
Simple merge