OSDN Git Service

Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev am: d55579889a
authorLei Yu <jackqdyulei@google.com>
Mon, 19 Jun 2017 17:47:35 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 17:47:35 +0000 (17:47 +0000)
commitc70c79aa5c49c3a73ba9e00c6439db5f68c8a4bf
tree694c1772629d3cb371aeddc9e8c743563baf1e18
parent1a74eefb5475c49732169787bfed4be5c25588d1
parent5350ec84c6f6ec5d3cf32248f0c7aa3b89edf37d
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev am: d55579889a
am: 5350ec84c6

Change-Id: I266271d5514f03bbb77fcb8c07cb53387fb1ec39