OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a5a706 8552eb7)
Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53 am: 71411b877a
authorPrimiano Tucci <primiano@google.com>
Fri, 26 Jan 2018 19:38:21 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 19:38:21 +0000 (19:38 +0000)
am: 8552eb769c  -s ours

Change-Id: Ia73b8d86b9291d9bad2163637832aa387262cc57


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