tree 551a4a4d26bb598844b0661df174c40b30697123
parent 8a64b1a7f4b07e71b9eb0f4a98710cb1409588bf
parent 4fa63b2d5e3b2e2a85bf17a9bf056cbdfb7046f0
author Jeff Sharkey <jsharkey@android.com> 1361468967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361468968 +0000

Merge "Improve notification UI for lockdown VPN."