tree c57118e18198a20e63555e66ef0cce8d4f1b6a63
parent bdbfe035557c6800be56d80d49c245f9d784f152
parent 1098f105e5e6420aba55c12210952225ebabce45
author Peter Ng <petergng@google.com> 1317081726 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317081726 -0700

Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic"