tree d6e695320d97c467d16fe12fd7d33163cff8c31a
parent a6a9fa802d1b56c206c670ca1d313bc64effcb5d
parent 6800627f331da6be1ea7cc82202eb6d94588c44f
author Dianne Hackborn <hackbod@google.com> 1361928178 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361928179 +0000

Merge "Call new init function to use for testing, to turn off app ops." into jb-mr2-dev