OSDN Git Service

resolved conflicts for merge of 081a136d to eclair
authorJean-Baptiste Queru <jbq@google.com>
Fri, 21 Aug 2009 19:59:04 +0000 (12:59 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 21 Aug 2009 19:59:04 +0000 (12:59 -0700)
commitdd03c6135f91df6d5d9e71de1487520dc3345742
treec4948e1ca876b218b8c50abd6171ad2be10396cd
parentbfcfb7eec61bd196cfd91f7b2c5715751308c048
parent081a136d259c02b2ab8ba773c38e404f7b3c3de4
resolved conflicts for merge of 081a136d to eclair
api/current.xml
core/java/android/app/SearchManager.java
core/res/res/values/attrs.xml
core/res/res/values/public.xml