OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ba2ec8 98a8258)
am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 28 Oct 2014 18:01:18 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Oct 2014 18:01:18 +0000 (18:01 +0000)
automerge: 98a8258

* commit '98a8258dd8759722b3aedce9297023291e33d724':
  Ensure trust agents are disabled in safe-mode


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