OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f3f1eb 300ab58)
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
authorRobert Shih <robertshih@google.com>
Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10


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