summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2010-11-03 20:11:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-03 20:11:28 -0700
commitc563859b1cab53dcde50e973994925d1cc60403e (patch)
tree99995fc1326f3f0ad1e7e4519398c80087e0f0fb /policy
parent6d93386a2d3c8fa612b2e52556bdbfca671efa73 (diff)
parentade230ed99097a09584a793ce720cc869c9ffeb4 (diff)
downloadframeworks_base-c563859b1cab53dcde50e973994925d1cc60403e.zip
frameworks_base-c563859b1cab53dcde50e973994925d1cc60403e.tar.gz
frameworks_base-c563859b1cab53dcde50e973994925d1cc60403e.tar.bz2
am ade230ed: (-s ours) am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit 'ade230ed99097a09584a793ce720cc869c9ffeb4': DO NOT MERGE - Updated VPNServices stat_sys icons
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions