Jakub Pawlowski
c4434b341a
Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c
...
am: 526719a1a2
2017-04-24 19:16:52 +00:00
Jakub Pawlowski
526719a1a2
Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14
...
am: 2fb02a252c
2017-04-24 19:11:07 +00:00
Android Build Merger (Role)
af6b454b14
Merge "Merge "fix service binding" into oc-dev am: 4eaeb91e42" into oc-dev-plus-aosp
2017-04-24 19:10:59 +00:00
Todd Kennedy
4bb06f9d1f
Merge "fix service binding" into oc-dev
...
am: 4eaeb91e42
2017-04-24 19:10:16 +00:00
Android Build Merger (Role)
3855f370d9
Merge "Merge "Remove @TestApi annotation" into oc-dev am: 1ab9119f50" into oc-dev-plus-aosp
2017-04-24 19:09:55 +00:00
Todd Kennedy
9e76c4e9db
Merge "Remove @TestApi annotation" into oc-dev
...
am: 1ab9119f50
2017-04-24 19:09:08 +00:00
Android Build Merger (Role)
79ffb5a284
Merge "Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b am: a80bb82b4e" into oc-dev-plus-aosp
2017-04-24 19:08:39 +00:00
Hugo Benichi
7a0191b355
Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b
...
am: a80bb82b4e
2017-04-24 19:07:37 +00:00
Android Build Merger (Role)
584f97470c
Merge "Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e am: 876ebaa8e1" into oc-dev-plus-aosp
2017-04-24 19:07:14 +00:00
Hugo Benichi
575523f2e7
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e
...
am: 876ebaa8e1
2017-04-24 19:06:20 +00:00
Android Build Merger (Role)
51848baf1b
Merge "Undeprecate WebView.findAddress am: 3f3354e087" into oc-dev-plus-aosp
2017-04-24 19:06:18 +00:00
Abodunrinwa Toki
52cf9e95ef
Undeprecate WebView.findAddress
...
am: 3f3354e087
2017-04-24 19:05:20 +00:00
Android Build Merger (Role)
9f17850a67
Merge changes from topic 'am-bbd64631c3584513a9a39c2ec7139a27' into oc-dev-plus-aosp
...
* changes:
Merge changes from topic 'langdet' into oc-dev am: e70ce27c448557802248
2017-04-24 19:03:16 +00:00
Abodunrinwa Toki
1f34114a61
Merge changes from topic 'langdet' into oc-dev
...
am: e70ce27c44
2017-04-24 19:01:28 +00:00
Abodunrinwa Toki
dc3a44ec33
Hide TextClassificationManager.detectLanguages API
...
am: 8557802248
2017-04-24 19:00:29 +00:00
Hugo Benichi
a80bb82b4e
Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff
...
am: 12c1074c8b
2017-04-24 18:58:54 +00:00
Hugo Benichi
876ebaa8e1
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e
...
am: 23d41ee68e
2017-04-24 18:54:23 +00:00
Android Build Merger (Role)
7a98adc8fb
Merge "Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b am: 8b90758b25" into oc-dev-plus-aosp
2017-04-24 18:50:43 +00:00
Robin Lee
40681387a9
Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b
...
am: 8b90758b25
2017-04-24 18:46:18 +00:00
Nicolas Geoffray
a98414fe89
Drop REASON_FORCED_DEXOPT.
...
am: 9cea1d28dd
2017-04-24 18:45:55 +00:00
Robin Lee
8b90758b25
Merge "Remove unused network management RPCs" am: 53a122986d
...
am: 10ebc1879b
2017-04-24 18:39:55 +00:00
Jeff Sharkey
f25b285706
Merge "More auto-doc work." into oc-dev
...
am: 6bc03748a7
2017-04-24 18:23:35 +00:00
Jakub Pawlowski
89e10d3eb4
Get rid of the IAdvertiserCallabck
...
Bug: 30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
2017-04-24 15:42:57 +00:00
TreeHugger Robot
4eaeb91e42
Merge "fix service binding" into oc-dev
2017-04-24 15:37:51 +00:00
TreeHugger Robot
1ab9119f50
Merge "Remove @TestApi annotation" into oc-dev
2017-04-24 15:35:51 +00:00
Abodunrinwa Toki
3f3354e087
Undeprecate WebView.findAddress
...
Reverts I772961bd20bff4817a060f14a843abeceb55ac92
Until we bring back TextClassifier.getLinks
See I275a9d055ef0ab68f3ca339c37ee939257c4bd54
Test: none
Bug: 22362008
Bug: 37565246
Change-Id: I2948f22cf4c3462491f47376af48624697703969
2017-04-24 14:41:14 +00:00
Abodunrinwa Toki
e70ce27c44
Merge changes from topic 'langdet' into oc-dev
...
* changes:
Hide TextClassifier.getLinks API.
Hide TextClassificationManager.detectLanguages API
2017-04-24 14:39:51 +00:00
Nicolas Geoffray
9cea1d28dd
Drop REASON_FORCED_DEXOPT.
...
This can already be configured with the default compiler filter.
Also remove unused performDexOptIfNeeded.
bug:35794392
Test: device boots, forced dexopt works.
Change-Id: I14fc86c4783b2d7ac9cf8972b6619ba303e79659
(cherry picked from commit e103256c1f
2017-04-24 10:44:31 +00:00
Hugo Benichi
21b9b3a8ff
Merge "Move byte logics from ApfFilter into BitsUtil"
2017-04-24 06:39:39 +00:00
Hugo Benichi
10b5024d5e
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)"
2017-04-23 23:35:53 +00:00
Robin Lee
53a122986d
Merge "Remove unused network management RPCs"
2017-04-22 21:59:57 +00:00
Jeff Sharkey
6bc03748a7
Merge "More auto-doc work." into oc-dev
2017-04-22 19:11:34 +00:00
Felipe Leme
4778d6d5d8
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
...
am: 7bb113566f
2017-04-22 04:28:33 +00:00
TreeHugger Robot
7bb113566f
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
2017-04-22 04:20:42 +00:00
Sudheer Shanka
ba16a5b5e9
Merge "Fix a spelling." into oc-dev
...
am: 1939550fba
2017-04-22 02:38:57 +00:00
TreeHugger Robot
1939550fba
Merge "Fix a spelling." into oc-dev
2017-04-22 02:32:39 +00:00
Andrii Kulian
9ca1490cbe
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev
...
am: b216d0f09f
2017-04-22 01:07:58 +00:00
Hugo Benichi
495a17b332
Move byte logics from ApfFilter into BitsUtil
...
This patch extracts into BitUtils byte manipulation helper methods
and unsigned type manipulation helper methods from ApfFilter into
an independent and reusable structure.
Test: $ runtest frameworks-net
Change-Id: I0f33af10457a63dbde5983f14353a79b8cd877d9
2017-04-22 10:07:03 +09:00
Andrii Kulian
b216d0f09f
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev
2017-04-22 00:59:39 +00:00
Hugo Benichi
9910dbc682
Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)
...
This patch is a partial cherry-pick from commit
df456e13a1df456e13a1
2017-04-22 09:58:42 +09:00
Hugo Benichi
658f2e5cd7
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
...
am: d2181235b9
2017-04-22 00:57:48 +00:00
Hugo Benichi
d2181235b9
Merge "NsdManager: add unit tests" am: dc54ad7fc3
...
am: 40ab8401b2
2017-04-22 00:49:19 +00:00
Dianne Hackborn
626a97618e
Merge "Address various JobScheduler API feedback." into oc-dev
...
am: e3cc9287ac
2017-04-22 00:39:09 +00:00
Dianne Hackborn
e3cc9287ac
Merge "Address various JobScheduler API feedback." into oc-dev
2017-04-22 00:33:47 +00:00
Hugo Benichi
dc54ad7fc3
Merge "NsdManager: add unit tests"
2017-04-22 00:31:28 +00:00
TreeHugger Robot
afe32d2fb1
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
2017-04-22 00:17:29 +00:00
TreeHugger Robot
08c90805b4
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
2017-04-21 23:40:28 +00:00
Robert Greenwalt
88a6acb9f6
Merge "Mark Restricted APN connections as restricted." am: b90b2015d3
...
am: 1778682242
2017-04-21 23:29:47 +00:00
Doris Liu
ce680bfd06
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
...
am: 4d72cd9550
2017-04-21 23:23:09 +00:00
Doris Liu
4d72cd9550
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
2017-04-21 23:14:34 +00:00
