OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de53b11 12bb3f0)
DO NOT MERGE: VPN network stat accounting changes. am: ffe5a46b3e -s ours
authorJeremy Joslin <jjoslin@google.com>
Fri, 9 Dec 2016 09:54:07 +0000 (09:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 09:54:07 +0000 (09:54 +0000)
am: 12bb3f057b  -s ours

Change-Id: Id9d26bf1b9512a85cd9b6a3253b86b77a6f62e77


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