OSDN Git Service

am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into...
authorDave Burke <daveburke@google.com>
Fri, 2 Aug 2013 20:42:04 +0000 (13:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Aug 2013 20:42:04 +0000 (13:42 -0700)
commit0b849a704b92e74b3e8c23c7ffbd26c38579369c
treeacf4142e3af9aa8599cc73824106fccd47062821
parent99d5938cf26d818deb9b30917ffafcb4b6b46365
parent1a32d477934399ca5331863fe17651c1dbf165b8
am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
  Revert "Completely remove app ops activity."
AndroidManifest.xml