OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a279046 350b9b9)
am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Aug 2013 22:55:50 +0000 (15:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 22:55:50 +0000 (15:55 -0700)
* commit '350b9b9bf12dbb75440f8a153aded304e224cf36':
  Add new app ops method to reset all op modes.
  Add new app ops method to reset all op modes.
  Revert "Add version identifier to app ops."
  Add version identifier to app ops.
  Allow the user to block notifications for foreground services.
  (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help