OSDN Git Service

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

Change-Id: Iaecb78eca49f32d155ea856630d6299b8604d8fc


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