OSDN Git Service

Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
authorLei Yu <jackqdyulei@google.com>
Mon, 19 Jun 2017 17:22:57 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 17:22:57 +0000 (17:22 +0000)
commit5350ec84c6f6ec5d3cf32248f0c7aa3b89edf37d
tree2e180978323656c3bd61eed1b9be1aa08b8c1164
parenteeda4ae540aa143b0cde9e43deb03abc7097a403
parentd55579889a9fa0fa2c3845b5ded3052bd8938361
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
am: d55579889a

Change-Id: I5c689e2f50f06c6501a771dd957e4408e888a092