summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ActivityNotFoundException.java
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-12-02 12:46:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 12:46:51 -0800
commit25bcbbb5971e2832c3020ee406b27d641d4ca05b (patch)
treece587ad9e55cb61a0a418b88be766a0b0f60cbb2 /core/java/android/content/ActivityNotFoundException.java
parent6d90c1c6fedc7add177418324ba5e591af543fa4 (diff)
parent431c3e4c7e2103865a90501a552b4e5145ed3f35 (diff)
downloadframeworks_base-25bcbbb5971e2832c3020ee406b27d641d4ca05b.zip
frameworks_base-25bcbbb5971e2832c3020ee406b27d641d4ca05b.tar.gz
frameworks_base-25bcbbb5971e2832c3020ee406b27d641d4ca05b.tar.bz2
am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '431c3e4c7e2103865a90501a552b4e5145ed3f35': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Diffstat (limited to 'core/java/android/content/ActivityNotFoundException.java')
0 files changed, 0 insertions, 0 deletions