OSDN Git Service

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)
commit253abcedd786632917f6452d2e37c403eb048cbd
treed2ca4740ca898a047aa0c57e9415a486f56231ce
parent1a5a7061eb05731e2dd6f948153447632f095637
parent8552eb769c0231ac1d4b68f94cee65b40dde688c
Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53 am: 71411b877a
am: 8552eb769c  -s ours

Change-Id: Ia73b8d86b9291d9bad2163637832aa387262cc57