Tomasz Mikolajewski
eacd7b9d5c
Merge \\\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\\" into nyc-dev am: ac3fe8fffe am: be6e44cdfa
...
am: 55ab54e33d
Change-Id: Ib073f974518fd01850c9a4be14fe6987658cf1d3
2016-06-14 04:39:25 +00:00
Tomasz Mikolajewski
55ab54e33d
Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am: ac3fe8fffe
...
am: be6e44cdfa
Change-Id: I0dc45cd8cb5c3e824edf56b4229c7dd752f77371
2016-06-14 04:34:50 +00:00
Tomasz Mikolajewski
be6e44cdfa
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
...
am: ac3fe8fffe
Change-Id: Ia2caacf5d322b807d29f51bde10b7866023b5de1
2016-06-14 04:24:44 +00:00
Tomasz Mikolajewski
ac3fe8fffe
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
2016-06-14 04:15:26 +00:00
Chad Brubaker
c67f201607
Merge \\\"Use NoPreloadHolder for certificate sources\\\" into nyc-dev am: c738e48ed6 am: 66bd9229dd
...
am: 8ae604b6f1
Change-Id: Id136b62eda2e0ef13ff6473b16f5db6586930871
2016-06-14 01:01:32 +00:00
Chad Brubaker
8ae604b6f1
Merge \\"Use NoPreloadHolder for certificate sources\\" into nyc-dev am: c738e48ed6
...
am: 66bd9229dd
Change-Id: I2eed24b14da4c2b6df4bc766aaf86fb08100cd90
2016-06-14 00:57:03 +00:00
Yohei Yukawa
e3d3740f1c
Merge \\"Add InputConnection#insertContent().\\" into nyc-mr1-dev am: 03f759e87e
...
am: 176642ec2c
Change-Id: I96395b6e883aa7dd462d1281b6859afa7b324937
2016-06-14 00:52:36 +00:00
Chad Brubaker
66bd9229dd
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
...
am: c738e48ed6
Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546
2016-06-14 00:49:25 +00:00
Yohei Yukawa
176642ec2c
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
...
am: 03f759e87e
Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
2016-06-14 00:38:47 +00:00
TreeHugger Robot
c738e48ed6
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev
2016-06-14 00:35:49 +00:00
Yohei Yukawa
03f759e87e
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
2016-06-14 00:26:39 +00:00
Roozbeh Pournader
547b74394a
Merge "Switch to standard SI prefixes for kilobyte etc"
2016-06-13 23:09:00 +00:00
Adrian Roos
5adaba4b21
Merge \"Merge \\\"Add MessagingStyle transitions\\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf\" into nyc-mr1-dev-plus-aosp
...
am: 70cfa1625b
Change-Id: I4b222abebb42b89ea36fd6f273c85c860c1d22f0
2016-06-13 22:52:58 +00:00
Makoto Onuki
eacbc45469
Merge \"Merge \\\"Push DO/PO package names from DPMS to PM\\\" into nyc-dev am: f419bd9e03 am: 93322e6818\" into nyc-mr1-dev-plus-aosp
...
am: 1dc43402e9
Change-Id: I6621d43fdebb9f7b76d9c2f49a77ec626642f8da
2016-06-13 22:52:46 +00:00
Chad Brubaker
319f9fe102
Use NoPreloadHolder for certificate sources
...
The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.
Bug: 29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3
2016-06-13 15:51:40 -07:00
Daniel Nishi
b382bb2c2f
Merge \"Merge \\"Add a flag to toggle how much the storage manager should retain.\\" into nyc-mr1-dev am: 7374971c28\" into nyc-mr1-dev-plus-aosp
...
am: 5fdb94ce1e
Change-Id: I30188ebb95237cc3fa43533d1b5c1df08f8cf4dc
2016-06-13 22:48:42 +00:00
Doris Liu
c88ded5a50
Merge \"Merge \\\"Fix setCurrentPlayTime for started but not yet pulsed animations\\\" into nyc-dev am: 42d39300cf am: a28f0003eb\" into nyc-mr1-dev-plus-aosp
...
am: 18b9573517
Change-Id: I6b9360bdbb145d4d0b6947ae11dd9dce7bdcbd5e
2016-06-13 22:39:07 +00:00
Yorke Lee
c516cde56d
Merge \\\"Check for detached view in drag-related APIs\\\" into nyc-dev am: cdc9d7bed9 am: 71ab239765
...
am: 23b3de425a
Change-Id: I01b319fc237737ee1f5c323795bc6dc7228a56cc
2016-06-13 22:36:04 +00:00
Android Build Merger (Role)
70cfa1625b
Merge "Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf" into nyc-mr1-dev-plus-aosp
2016-06-13 22:34:23 +00:00
Adrian Roos
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
Change-Id: Ifd034837a0b82416e6f87dffb944b0761734a59a
2016-06-13 22:33:38 +00:00
Android Build Merger (Role)
1dc43402e9
Merge "Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03 am: 93322e6818" into nyc-mr1-dev-plus-aosp
2016-06-13 22:32:05 +00:00
Makoto Onuki
31a5d3affa
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03
...
am: 93322e6818
Change-Id: I4fd9877c9e6adcdeeb17a9a5a2e70731f6e0b596
2016-06-13 22:30:20 +00:00
Doris Liu
7fc18d996f
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am: 42d39300cf
...
am: da1cd7a43f
Change-Id: Ia057745daf7f84a6a00163b086d8e361ffa02bc7
2016-06-13 22:30:12 +00:00
Daniel Nishi
d630a5b9a4
Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev
...
am: 7374971c28
Change-Id: I17595b0268e73d9b3193eb81f6779278d2502efa
2016-06-13 22:28:18 +00:00
Svetoslav Ganov
b01939c3b3
Merge \\\"Fix permissions update for VrListenerService on user changes.\\\" into nyc-dev am: d054f4f2fe am: 3224aa7505
...
am: 3505a88472
Change-Id: I548365e861a938fad3b8d28ca2d6f0f6a8b1f367
2016-06-13 22:28:12 +00:00
Doris Liu
5bc7bf3305
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am: 42d39300cf
...
am: a28f0003eb
Change-Id: Iba6b86b35e96547251a9eec3dd3ac41ab929965a
2016-06-13 22:27:27 +00:00
Yorke Lee
67fb47fb9f
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9
...
am: fead52ebf4
Change-Id: I4177d8c71d8147bf6c0a1c67f38e97593712b19a
2016-06-13 22:27:22 +00:00
Yorke Lee
23b3de425a
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9
...
am: 71ab239765
Change-Id: Ie46aaaa63dc9fe9232f6c9fe661b88765f1dd7c8
2016-06-13 22:27:20 +00:00
Ruben Brunk
3505a88472
Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe
...
am: 3224aa7505
Change-Id: I2e189f09f28a3b64c37da44caeb96af095cc1709
2016-06-13 22:21:04 +00:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
2016-06-13 22:20:05 +00:00
Makoto Onuki
93322e6818
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
2016-06-13 22:17:10 +00:00
Doris Liu
da1cd7a43f
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
...
am: 42d39300cf
Change-Id: Ia7bf744345494bbd13a742f33cb63acbe0ab3315
2016-06-13 22:16:57 +00:00
Yorke Lee
71ab239765
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
2016-06-13 22:14:24 +00:00
Svetoslav Ganov
5d411eb81a
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
...
am: d054f4f2fe
Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
2016-06-13 22:14:09 +00:00
Adrian Roos
c8649b381d
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0
2016-06-13 21:55:06 +00:00
Adrian Roos
a5e2aa99c0
Merge "Add MessagingStyle transitions" into nyc-dev
2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3
Add MessagingStyle transitions
...
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00
TreeHugger Robot
58806af09c
Merge "new ClipData constructor."
2016-06-13 21:30:48 +00:00
Makoto Onuki
78f16950c6
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
Change-Id: Ic3071f3a712da72fd141ef37ac6aabe6dbd09355
2016-06-13 21:23:18 +00:00
Daniel Nishi
7374971c28
Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev
2016-06-13 21:18:29 +00:00
Makoto Onuki
f419bd9e03
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
2016-06-13 21:16:29 +00:00
Doris Liu
a28f0003eb
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
...
am: 42d39300cf
Change-Id: I7c1f2adb31ece266b082ffb9ea85b17c083b518c
2016-06-13 20:31:32 +00:00
Doris Liu
42d39300cf
Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev
2016-06-13 20:24:45 +00:00
Yorke Lee
fead52ebf4
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
Change-Id: Id1c2228d081e63e86278072654c4c611bdb10d1a
2016-06-13 20:15:15 +00:00
TreeHugger Robot
cdc9d7bed9
Merge "Check for detached view in drag-related APIs" into nyc-dev
2016-06-13 20:09:43 +00:00
Svetoslav Ganov
3224aa7505
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
...
am: d054f4f2fe
Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
2016-06-13 20:03:40 +00:00
Ruben Brunk
d054f4f2fe
Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev
2016-06-13 19:58:31 +00:00
Steve McKay
57eaaf6857
new ClipData constructor.
...
Add new constructor with args: ClipDescription, ArrayList<Item>.
This allows description and item list to be constructed separately.
Change-Id: I09f63d308dbafdb2c749019848afb0d2d24b8c44
2016-06-13 12:54:14 -07:00
Roozbeh Pournader
dce22f0406
Merge "Clean up TextUtils.doesNotNeedBidi()"
2016-06-13 19:53:32 +00:00
Yorke Lee
07452c37ab
Check for detached view in drag-related APIs
...
Bug: 29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
2016-06-13 11:32:23 -07:00