summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-24 10:01:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-24 10:01:49 -0700
commitb59fbafe5d184017fe951afd6002e8408bf5c279 (patch)
treec5de1f11b518a6b57331fd5f65eada1b81380b76 /services/java/com/android
parentcbcf8f6311e28a1bc74b780dc72adecbcfe61d44 (diff)
parent3cffe1ababdb09f4a90274e25c2f66feee299835 (diff)
downloadframeworks_base-b59fbafe5d184017fe951afd6002e8408bf5c279.zip
frameworks_base-b59fbafe5d184017fe951afd6002e8408bf5c279.tar.gz
frameworks_base-b59fbafe5d184017fe951afd6002e8408bf5c279.tar.bz2
am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken * commit '3cffe1ababdb09f4a90274e25c2f66feee299835': Doc change: Fix incorrect adt version reference etc.
Diffstat (limited to 'services/java/com/android')
0 files changed, 0 insertions, 0 deletions