OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d2be795
7fe0c25
)
resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp
author
pkanwar
<pkanwar@google.com>
Fri, 6 May 2016 02:05:43 +0000
(
02:05
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 6 May 2016 02:05:43 +0000
(
02:05
+0000)
am:
7fe0c25f77
* commit '
7fe0c25f77e30c63eb486ae340ff8b1ce82c190c
':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I0f4c21c20d921d9f239b6a4aa3352d9fb76280c8
Trivial merge