summaryrefslogtreecommitdiffstats
path: root/vpn
diff options
context:
space:
mode:
authorBasavapatna Dattaguru <dattaguru@google.com>2011-01-26 22:52:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 22:52:38 -0800
commit90982936a026f1f951fe06ad4d2bcfd72a99ab8f (patch)
treed7e1aab9943cdda171c0c7a9fc9807276f9639ef /vpn
parent141a2adb25130bcbe8620ae239e94d33c7c92eef (diff)
parent89378fd1666cd589599a0c5a7d0c71fa2f8159a5 (diff)
downloadframeworks_base-90982936a026f1f951fe06ad4d2bcfd72a99ab8f.zip
frameworks_base-90982936a026f1f951fe06ad4d2bcfd72a99ab8f.tar.gz
frameworks_base-90982936a026f1f951fe06ad4d2bcfd72a99ab8f.tar.bz2
am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5': Revert "Video editor CTS: Framework modifications"
Diffstat (limited to 'vpn')
0 files changed, 0 insertions, 0 deletions