OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdb1902 ba3aa08)
am ba3aa080: (-s ours) am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsSer...
authorAmith Yamasani <yamasani@google.com>
Thu, 27 Aug 2015 08:52:46 +0000 (08:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:52:46 +0000 (08:52 +0000)
* commit 'ba3aa0808f2536ccde9171e2396cf68bf0833013':


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