| commit | fe90d78e5430a0c3d4e1c79de45a12c19b52f93d | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Wed Aug 13 04:26:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 13 04:26:04 2014 +0000 |
| tree | 05547be41ff83648d66a49c4530076d0fac0a483 | |
| parent | 3ca0fb8e1dc896dbbd80232487ac1b086a381261 [diff] | |
| parent | e9c39d0868b3c97eed55104cd73f48025021a491 [diff] |
am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev * commit '3f96209d8791524f1d5df8ae23fffaeaa8725c47': TIF: Temporarily disable permission check for parental controls