tree fc039d8bd2e36d0bc5a3de2d7f875ac38a144fc6
parent d346fce2687237d30677b69e66c76ba6cba8622b
parent db2c56889435e408bcea4a3f085782abe83613a5
author Dave Burke <daveburke@google.com> 1375475793 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375475793 +0000

Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev