| commit | ee53d98c93e19f8a163fa1390c615bdccefbdbdd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 11:11:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 10 11:11:50 2013 -0700 |
| tree | 342a63f03b8af9f9f201a63d1766a0784d6783ef | |
| parent | 03a9fb6723f2f6692abab83a75ce5a1e8ca63017 [diff] | |
| parent | 302bd5c78a860081ce63d7faba9b20c7d9af4092 [diff] |
am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '302bd5c78a860081ce63d7faba9b20c7d9af4092': Don't show ApnEditor as a dialog Import translations. DO NOT MERGE Allow hidden apps to opt-out resolved conflicts for merge of 5d21820a to jb-mr2-dev Fix issue #9074296: Device Admins can activate in a way... Ensure all active Device Admins are listed.