OSDN Git Service

(root) / android-x86 / packages-apps-Bluetooth.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c14386 190f774)
resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff am: 8b498077ce am: 48f76...
authorAjay Panicker <apanicke@google.com>
Tue, 6 Dec 2016 18:09:53 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 18:09:53 +0000 (18:09 +0000)
am: 190f774cb9

Change-Id: Ieb4f898abf780b7c56e36599a99995cdbbdae3cd


Trivial merge
packages/apps/Bluetooth
About OSDN
Find Software
Develop Software
Help