Phil Weaver
|
88ac6d9605
|
Merge "Make a11y clickable span work after node recycle" into oc-dev am: 5d25f429bf
am: 0b3408a369
Change-Id: I8e354ba1ecb353c696d6a7df07701c5c19544b6e
|
2017-04-20 16:59:33 +00:00 |
|
Jesse Hall
|
81cacd871d
|
Merge "Merge "Vulkan compute 0 only requires variable pointers" into oc-dev am: 45ff1d1ad3" into oc-dev-plus-aosp
am: 61244e64a6
Change-Id: I6ad5d14f3428a15f122aa6e66e9ede930bda3d93
|
2017-04-20 16:56:38 +00:00 |
|
Bryce Lee
|
ee05c604f8
|
Merge "Merge "Deprecate Activity#requestVisibleBehind" into oc-dev am: e4b6441198" into oc-dev-plus-aosp
am: d0ead2aa95
Change-Id: I1883a2ce2c199b2a3169d8fde389a6d8fb880b08
|
2017-04-20 16:50:02 +00:00 |
|
Abodunrinwa Toki
|
e0a8e5bcef
|
Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev am: 06a53d4729" into oc-dev-plus-aosp
am: 528adaed4f
Change-Id: If30d4f866655de89618d1afcb5560f9827691e11
|
2017-04-20 16:44:24 +00:00 |
|
Andrei Stingaceanu
|
3926110944
|
Merge "Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev am: 635d9dd864" into oc-dev-plus-aosp
am: 19eafb9534
Change-Id: I224e35a6dcb59a99500e8903f90d9b9a66a64360
|
2017-04-20 16:41:59 +00:00 |
|
Abodunrinwa Toki
|
c63a0033f8
|
Merge "Merge "TRON: Log "textAssist" actions." into oc-dev am: fa9d889d3e" into oc-dev-plus-aosp
am: a039aa4439
Change-Id: I417110a15dfef29ff01fcd923ae29ec6f76f4d51
|
2017-04-20 16:39:54 +00:00 |
|
Clara Bayarri
|
fb164c34f2
|
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev am: 1ef45a8bed
am: 18d539cd0a
Change-Id: I1712bdf8f1cb559a657407785230eccb4dd75722
|
2017-04-20 16:31:49 +00:00 |
|
Erik Kline
|
57c252b9b1
|
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3 am: 3fa8908370
am: c9ee35581c
Change-Id: I7fa567b7af041bf2557cdc1d97a73440758ceb0c
|
2017-04-20 16:29:52 +00:00 |
|
Hugo Benichi
|
b028d18f8a
|
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7 am: b51307e12e
am: 7b8fc6ea79
Change-Id: Ic919f56d9aca75842129f96d0b5b75b53c1e9fd8
|
2017-04-20 16:28:06 +00:00 |
|
Erik Kline
|
51e9169edd
|
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f am: d9bfb83d96
am: 372edc3b7d
Change-Id: I7f09742f4c8e78d41a0bce29fe5d356472819869
|
2017-04-20 16:22:44 +00:00 |
|
Phil Weaver
|
0b3408a369
|
Merge "Make a11y clickable span work after node recycle" into oc-dev
am: 5d25f429bf
Change-Id: Ic25383f328c9dbe82241bc8a726fc5fa854b7811
|
2017-04-20 16:22:43 +00:00 |
|
Jesse Hall
|
39368e0f01
|
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
am: 45ff1d1ad3
Change-Id: I2aecffc6cd849e9809d51274d2f0028f1786cb4e
|
2017-04-20 16:15:50 +00:00 |
|
Bryce Lee
|
08cda62574
|
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
am: e4b6441198
Change-Id: Ib18fa326c6f41b8f83cd9d08043acd2b80324db1
|
2017-04-20 16:12:54 +00:00 |
|
Jocelyn Dang
|
cc63daaf55
|
Merge "Add min and max learned battery capacity to batterystats." into oc-dev am: b2aa0ceb0d
am: f29eb24c4e
Change-Id: I8f86cadf46b4cb9dc3dc87c1137f3b876108fca3
|
2017-04-20 16:08:48 +00:00 |
|
Abodunrinwa Toki
|
d5857c4e9f
|
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
am: 06a53d4729
Change-Id: Ia739bdad9c5877f9e02efba709521fb9c9dc8795
|
2017-04-20 16:08:24 +00:00 |
|
Andrei Stingaceanu
|
c033cf3a73
|
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
am: 635d9dd864
Change-Id: Ic11450a566051ca63f3b65e60c70e8da4d1cef11
|
2017-04-20 16:07:03 +00:00 |
|
Abodunrinwa Toki
|
1ecfa26c90
|
Merge "TRON: Log "textAssist" actions." into oc-dev
am: fa9d889d3e
Change-Id: I068828dfb979dec12f30b7b0d01464d0bb895691
|
2017-04-20 16:05:43 +00:00 |
|
Clara Bayarri
|
18d539cd0a
|
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
am: 1ef45a8bed
Change-Id: Ife03fa12b508a54465a3b57f9b97ed1bb0a6c059
|
2017-04-20 16:01:03 +00:00 |
|
Svetoslav Ganov
|
993f63270f
|
Merge "Address API council comments" into oc-dev am: fb4fb03cc3
am: 375d615b30
Change-Id: Ibba72870f4d4da53ab411b5e279a967a86584e19
|
2017-04-20 15:28:57 +00:00 |
|
Ashutosh Joshi
|
43999ea643
|
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev am: bf2e5bd0f9
am: ae1fb69407
Change-Id: Ibe4c0ed4c5cdc53a804a4e7ed8098f800e5bfb46
|
2017-04-20 15:16:43 +00:00 |
|
Christopher Tate
|
a3f70c18af
|
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev am: aa6b649a35
am: e56d699a89
Change-Id: I5d684f3dc14130655868394b001d2960a84d1579
|
2017-04-20 15:09:39 +00:00 |
|
Martijn Coenen
|
1ca9b4e332
|
Merge "Validate incoming data properly." into oc-dev am: a0aa7c3093
am: 621c6019e7
Change-Id: I85b3b6a099cf1a7a7f1134f23601b8d2a774f6a3
|
2017-04-20 15:03:20 +00:00 |
|
Garfield Tan
|
7c3656dfa2
|
Merge "Add a null check for visibleFile." into oc-dev am: 1fb3e56998
am: 8a9a686c9f
Change-Id: I7ed34f0644cd219e5a1f295c91f3b81605526b15
|
2017-04-20 15:01:26 +00:00 |
|
Ian Lake
|
7d68da20f1
|
Merge "Move expensive TextClock operations to onAttach" into oc-dev am: 4f3ba1aeed
am: 2e342f875d
Change-Id: I041f493629d356fcdaf204a3c49aea969a259572
|
2017-04-20 14:59:35 +00:00 |
|
Selim Cinek
|
00511d3dfb
|
Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev am: 947be6bed9
am: c40344bf86
Change-Id: I849b78ceb45e22ab1b63bf4fbb88aac40625fd22
|
2017-04-20 14:57:42 +00:00 |
|
Phil Weaver
|
5d25f429bf
|
Merge "Make a11y clickable span work after node recycle" into oc-dev
|
2017-04-20 14:51:43 +00:00 |
|
Jesse Hall
|
45ff1d1ad3
|
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
|
2017-04-20 14:51:36 +00:00 |
|
Dianne Hackborn
|
9ab0f438e1
|
Merge "Fix issue #37470038: API Review: ServiceConnection.onBindingDead()" into oc-dev am: 232ff0bdc8
am: 54246d5374
Change-Id: Id414ddd56d711cf4f0e383d8e0964add4129eec0
|
2017-04-20 14:44:48 +00:00 |
|
Suprabh Shukla
|
2fa6412a86
|
Merge "Package installer related changes to javadoc" into oc-dev am: 52312298b6
am: a2450bacdc
Change-Id: I7bf7b87bfc5f4eb71b8cc1177375c257e5c79499
|
2017-04-20 14:37:05 +00:00 |
|
Bryce Lee
|
e4b6441198
|
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
|
2017-04-20 14:19:16 +00:00 |
|
Erik Kline
|
c9ee35581c
|
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3
am: 3fa8908370
Change-Id: If3851c3f15314e3c0d357e154049aaa2b8b5c8e7
|
2017-04-20 14:02:24 +00:00 |
|
Hugo Benichi
|
7b8fc6ea79
|
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7
am: b51307e12e
Change-Id: I2f5fad0b559b972e82ecacdfcdd3805f0fbb2655
|
2017-04-20 13:59:32 +00:00 |
|
Jakub Pawlowski
|
d911bf886b
|
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350 am: fc99848b96 am: f3732e2fe2" into oc-dev-plus-aosp
am: 88522c5f5d
Change-Id: I8a07a4e8a6466d5629d504e900c11d5164ba9490
|
2017-04-20 13:56:06 +00:00 |
|
Erik Kline
|
372edc3b7d
|
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f
am: d9bfb83d96
Change-Id: I6dd418684b1a40292cd496ead3613cf938577c09
|
2017-04-20 13:52:35 +00:00 |
|
Ian Lake
|
dcdbd97caa
|
Create a valid ActivityOptions Bundle even for default animations am: b759bd3b4a
am: d85e60aa46
Change-Id: I4c863de66246d6d9a6c64ea1e428094a15c682c1
|
2017-04-20 13:39:13 +00:00 |
|
Ian Lake
|
083641c47a
|
Remove scale up animation for startActivity from RemoteViews am: 95b193fdca
am: 594f401e26
Change-Id: Ifd958d94b0032d486e01e1be8d44d1b68ca1c4b7
|
2017-04-20 13:37:42 +00:00 |
|
Chad Brubaker
|
696ab6b7ff
|
Merge "Change ANDROID_ID for Instant Apps" into oc-dev am: 904e6cad28
am: 97eecf8d09
Change-Id: Ibbea27ef27bfaa43649d0ff86e23f0ffd559d7f6
|
2017-04-20 13:34:06 +00:00 |
|
Abodunrinwa Toki
|
06a53d4729
|
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
* changes:
SmartSelection Config installer.
LangId Config installer.
|
2017-04-20 13:30:35 +00:00 |
|
Hugo Benichi
|
3ff96e5dd8
|
resolve merge conflicts of 7bbd03be36 to oc-dev-plus-aosp
Conflits were:
- static import section of ConnectivityService
- code deleted in commit a038568676
Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
|
2017-04-20 22:26:50 +09:00 |
|
Jeff Sharkey
|
3ea7c8b6d5
|
Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
am: 750d6d12f6
Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
|
2017-04-20 13:15:28 +00:00 |
|
Andrei Stingaceanu
|
635d9dd864
|
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
|
2017-04-20 13:14:06 +00:00 |
|
Abodunrinwa Toki
|
fa9d889d3e
|
Merge "TRON: Log "textAssist" actions." into oc-dev
|
2017-04-20 13:08:52 +00:00 |
|
Erik Kline
|
3fa8908370
|
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79
am: 6af3dd0fc3
Change-Id: Icef7c38313576219b4a55eb10648297b18597ef6
|
2017-04-20 13:00:52 +00:00 |
|
Hugo Benichi
|
b51307e12e
|
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69
am: 23ee1621c7
Change-Id: Ib7ff014bd0b7729ca2d02956c190f368963ff632
|
2017-04-20 12:53:22 +00:00 |
|
TreeHugger Robot
|
1ef45a8bed
|
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
|
2017-04-20 12:52:43 +00:00 |
|
Eugene Susla
|
cbe10269b5
|
Merge "Make javadoc of companion service name more like others" into oc-dev am: 4d95e40bb3
am: aaa64afd83
Change-Id: Idbae279855b0851cf53fc1a7e17594a0590acbf3
|
2017-04-20 12:50:25 +00:00 |
|
Treehugger Robot
|
4c7a999d79
|
Merge "Add local-only hotspot info into tether state change broadcast"
|
2017-04-20 12:47:55 +00:00 |
|
Jeff Sharkey
|
fb303617f8
|
Merge "Some folks like sending null fields." into oc-dev am: 9a1967e157
am: 218c2135b6
Change-Id: I56fe999c3edb167aac57284700d3ccbbc5d4f9ea
|
2017-04-20 12:46:37 +00:00 |
|
Hugo Benichi
|
458f75ef69
|
Merge "ConnectivityManager: remove obsolete callback types"
|
2017-04-20 12:38:29 +00:00 |
|
TreeHugger Robot
|
e54a1877e9
|
Merge "Add more explicit documentation for install reason"
|
2017-04-20 12:05:49 +00:00 |
|