OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4043fd8 6fdf2a1)
am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing...
authorJeff Davidson <jpd@google.com>
Tue, 25 Nov 2014 17:49:39 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Nov 2014 17:49:39 +0000 (17:49 +0000)
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
  Don't enforce control permission when preparing consented VPN.


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