OSDN Git Service

Merge "Disable camera and search from some security screens." into klp-dev
authorJim Miller <jaggies@google.com>
Tue, 8 Oct 2013 00:49:23 +0000 (00:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 8 Oct 2013 00:49:23 +0000 (00:49 +0000)
commit961d2f4643e9b3f6f774ab9567c36f659f423254
tree1ed97dc23e10c8b63f240ebdb2f82a6715f7c260
parent6930d3805e1f0e770c636b8419a105bc19919048
parent9c993bd6ba75eb07e2f8e68cf57c780a83699116
Merge "Disable camera and search from some security screens." into klp-dev