summaryrefslogtreecommitdiffstats
path: root/vpn
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-08 17:58:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-08 17:58:35 -0700
commitd7dccd26115851c49c91db204f88db7a7973b2f6 (patch)
tree715bdf3538d05fb0fef52aa5facceb9cb82666bc /vpn
parent682d143decaa390f55428ac7b6c730831f54077d (diff)
parent55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f (diff)
downloadframeworks_base-d7dccd26115851c49c91db204f88db7a7973b2f6.zip
frameworks_base-d7dccd26115851c49c91db204f88db7a7973b2f6.tar.gz
frameworks_base-d7dccd26115851c49c91db204f88db7a7973b2f6.tar.bz2
am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f' * commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f': Make Activity.removeDialog() less strict.
Diffstat (limited to 'vpn')
0 files changed, 0 insertions, 0 deletions