tree 30105525fdba0fb1a74e6a14c770ea0b8c143b84
parent ef5694692f88bb91ed6ee1191b11a66ec594ff39
parent ccacd87a39c77dacb08b765150a8e93f3b9aad02
author Justin Ho <justinho@google.com> 1288816766 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288816766 -0700

Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread