summaryrefslogtreecommitdiffstats
path: root/vpn/java
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2010-07-15 17:32:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-15 17:32:04 -0700
commit3f50035c3db3cd38653d8e212c8caf77c4c3200e (patch)
tree3b0975868c1f42045d6302b9e2ab944794e5df47 /vpn/java
parent527e9c8f0471666b5b1c461f1a8a710192208e70 (diff)
parenta6a134d42df5fde04f2cc379175c756aff333cb3 (diff)
downloadframeworks_base-3f50035c3db3cd38653d8e212c8caf77c4c3200e.zip
frameworks_base-3f50035c3db3cd38653d8e212c8caf77c4c3200e.tar.gz
frameworks_base-3f50035c3db3cd38653d8e212c8caf77c4c3200e.tar.bz2
am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit 'a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp * commit 'a6a134d42df5fde04f2cc379175c756aff333cb3': Doc change: Update AVD create instructions.
Diffstat (limited to 'vpn/java')
0 files changed, 0 insertions, 0 deletions