summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk/index.jd
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-08-21 13:02:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-21 13:02:50 -0700
commit56a63fedcf4caa5b85994dc9f2d960293c2696e2 (patch)
treea24321dc355c655d29dad455a79958d4311f8f30 /docs/html/sdk/index.jd
parentd7f4d90902861f979fbb1e13c7734852de84ef20 (diff)
parent761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8 (diff)
downloadframeworks_base-56a63fedcf4caa5b85994dc9f2d960293c2696e2.zip
frameworks_base-56a63fedcf4caa5b85994dc9f2d960293c2696e2.tar.gz
frameworks_base-56a63fedcf4caa5b85994dc9f2d960293c2696e2.tar.bz2
am 761f7934: am dd03c613: resolved conflicts for merge of 081a136d to eclair
Merge commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8' * commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8': Remove third party support for Quick Search Box (aka global search).
Diffstat (limited to 'docs/html/sdk/index.jd')
0 files changed, 0 insertions, 0 deletions