summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2009-11-25 13:04:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-25 13:04:19 -0800
commit86ef717e2660dbc914dcf68295fbf9943c45bc44 (patch)
treec5fa8d52f0d09920ac2e62e2a6d9bff1bb770751 /Android.mk
parentf6a1dab030095ad1ed58d387ff21a112bca5b610 (diff)
parent99cee0318bdceb6e996bbe9a3e0f961d622e0365 (diff)
downloadframeworks_base-86ef717e2660dbc914dcf68295fbf9943c45bc44.zip
frameworks_base-86ef717e2660dbc914dcf68295fbf9943c45bc44.tar.gz
frameworks_base-86ef717e2660dbc914dcf68295fbf9943c45bc44.tar.bz2
am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp * commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365': Change the DropBoxManager API slightly (this is public, but not yet released) --
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions