| commit | 14c8056525cfb5060a68fa2ed5f41fb6d1587873 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 02 17:58:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 02 17:58:47 2013 -0700 |
| tree | fb48d8e067210202e2ebf53fa1c4791317bc7a84 | |
| parent | 1cad5b21e4014e013fdc169f100bf36146802c0b [diff] | |
| parent | a43e27016410910e9d11c09e981e58743ee9439e [diff] |
am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge * commit 'a43e27016410910e9d11c09e981e58743ee9439e': Completely remove app ops activity.