OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 806f019 af3fb3e)
Merge "Move Keepalive out of IpSecTransform.Builder"
authornharold <nharold@google.com>
Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)
am: af3fb3efe4

Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604


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