OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d788276) | patch
fix the build breakage cuased by merge resolution
authorAlexey Polyudov <apolyudov@google.com>
Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)
committerAlexey Polyudov <apolyudov@google.com>
Thu, 2 Feb 2017 20:59:50 +0000 (12:59 -0800)
commit8c041f786200bed1050e8155aa620c02ab5db5cf
tree4b6e9e3eeff1ecfee3dc97c4b65940fe40297bedtree | snapshot
parentd7882765da193fc51868813db57080672e98197ccommit | diff
fix the build breakage cuased by merge resolution

commit 5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
src/com/android/settings/bluetooth/LocalBluetoothPreferences.java diff | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help