OSDN Git Service

am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev ...
authorJean-Baptiste Queru <jbq@google.com>
Sat, 3 Aug 2013 00:58:47 +0000 (17:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Aug 2013 00:58:47 +0000 (17:58 -0700)
* commit 'a43e27016410910e9d11c09e981e58743ee9439e':
  Completely remove app ops activity.


Trivial merge