OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b94777c 19f7007)
am 19f7007b: (-s ours) am 9a81a182: Merge "Don\'t always transfer device owner status...
authorRubin Xu <rubinxu@google.com>
Thu, 27 Aug 2015 09:42:32 +0000 (09:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:42:32 +0000 (09:42 +0000)
* commit '19f7007bc349481a0796fb86359d930f7057c539':


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