OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0a7c416
0cf4d7c
)
Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev
author
android-build-team Robot
<android-build-team-robot@google.com>
Thu, 3 May 2018 22:36:11 +0000
(22:36 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 3 May 2018 22:36:11 +0000
(22:36 +0000)
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
am:
1839e70cda
am:
cdc99a0e87
am:
f145e8172c
am:
d72de1bde1
skipped:
2005cc7070
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
am:
1839e70cda
am:
cdc99a0e87
am:
f145e8172c
am:
d72de1bde1
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
am:
1839e70cda
am:
cdc99a0e87
am:
f145e8172c
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
am:
1839e70cda
am:
cdc99a0e87
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
am:
1839e70cda
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
skipped:
365fb1c844
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
am:
0cd0cef08f
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
am:
8fbe4bce1e
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Trivial merge