tree c50a44aac963af08c1b4839eaf1f8428e25e1c62
parent d5d61a0ab18c57cf2087d17f10d4d4569d968078
parent 1d4329631db7c2bf9f4daba2512812f90f54f5ce
author Amith Yamasani <yamasani@google.com> 1368568467 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368568468 +0000

Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev