OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f90e7b 216a0bd)
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE. am: c20c2ea28e -s ours
authorTobias Thierer <tobiast@google.com>
Mon, 3 Jul 2017 15:26:06 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 15:26:06 +0000 (15:26 +0000)
am: 216a0bdfb8  -s ours

Change-Id: I5b08b986e8b29e6890d314bbac45bab0439282d5


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