tree 6f43e6f005a32fd8e6670a2b0bce8ad75a13f3a9
parent d9eb46c75a4a11d4db705a39db6e5ca192b9b322
parent f20d640fa2b155a971ddfe0965fc803a73b5e53c
author Amith Yamasani <yamasani@google.com> 1401590223 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401590223 +0000

Merge "Restrictions Manager"