OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df7becb 3ba1477)
am 3ba14771: (-s ours) am bd042089: DO NOT MERGE Fix build for notification listener...
authorGriff Hazen <griff@google.com>
Wed, 18 Jun 2014 10:19:09 +0000 (10:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Jun 2014 10:19:09 +0000 (10:19 +0000)
* commit '3ba147712ba2738c00509df28e4c50e59dbdeb2e':
  DO NOT MERGE Fix build for notification listener internal api change


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help