Sudheer Shanka
80f80e7e70
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
...
am: 555fbf30d2
2016-08-26 00:48:30 +00:00
Sudheer Shanka
6a031dec20
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours
...
am: 6a9490f850
2016-08-26 00:48:27 +00:00
Amith Yamasani
3cf46af37b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
...
am: 4ee46e5b99
2016-08-26 00:48:15 +00:00
Amith Yamasani
258c3eab25
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours
...
am: b6cc1acb63
2016-08-26 00:48:13 +00:00
Mark Goldstein
7843568a38
Merge "docs: Fix typo" into nyc-dev
...
am: 8d660eebad
2016-08-26 00:47:59 +00:00
Mark Goldstein
94d4c84f38
docs: Fix typo
...
am: 1c22ae296b
2016-08-26 00:47:56 +00:00
Narayan Kamath
5a56efd888
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
...
am: 1238ffcd2c
2016-08-26 00:42:28 +00:00
Dianne Hackborn
c84e8f39d0
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
...
am: 184edd6d93
2016-08-26 00:42:25 +00:00
Dianne Hackborn
ccc9f7a59e
Try to mitigate issue #31016187 : system_server crash in ArraySet.
...
am: dd28b7b5f3
2016-08-26 00:42:22 +00:00
Mark Lu
7973c74cdc
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
...
am: 30cba33a60
2016-08-26 00:42:17 +00:00
Mark Lu
833d07e53a
docs: rewrite one attribute description in R.attr
...
am: 5dabf06ae5
2016-08-26 00:42:13 +00:00
Mark Lu
6446e88183
Merge "docs: fix broken links in Activity reference" into nyc-dev
...
am: d428a012ba
2016-08-26 00:42:06 +00:00
Mark Lu
c4e81b64f1
docs: fix broken links in Activity reference
...
am: fa43485910
2016-08-26 00:42:01 +00:00
Mark Lu
228b5f6fb4
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
...
am: 209fb02f84
2016-08-26 00:41:54 +00:00
Mark Lu
3de2eff9d5
docs: fix code snippets in SQL Databases page
...
am: 95698f127a
2016-08-26 00:41:48 +00:00
Hemal Patel
309813c8af
resolve merge conflicts of a544221 to nyc-dev-plus-aosp
...
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
2016-08-25 17:30:34 -07:00
Android Build Merger (Role)
555fbf30d2
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
2016-08-25 23:41:20 +00:00
Android Build Merger (Role)
4ee46e5b99
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
2016-08-25 23:41:08 +00:00
Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Sudheer Shanka
6a9490f850
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa
...
am: bc5775c18b
2016-08-25 23:39:41 +00:00
Amith Yamasani
b6cc1acb63
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38
...
am: a106b52180
2016-08-25 23:39:37 +00:00
Sudheer Shanka
bc5775c18b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e
...
am: 2f664374fa
2016-08-25 23:29:56 +00:00
Amith Yamasani
a106b52180
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a
...
am: 5eed3c9c38
2016-08-25 23:29:52 +00:00
Narayan Kamath
1238ffcd2c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
...
am: b0429bbad5
2016-08-25 23:29:29 +00:00
Sudheer Shanka
2f664374fa
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb
...
am: 2490679d7e
2016-08-25 23:22:04 +00:00
Amith Yamasani
5eed3c9c38
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d
...
am: 1d513c845a
2016-08-25 23:22:00 +00:00
Narayan Kamath
b0429bbad5
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
...
am: a21569cd76
2016-08-25 23:21:09 +00:00
Sudheer Shanka
2490679d7e
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours
...
am: 86ac88ccdb
2016-08-25 23:14:01 +00:00
Amith Yamasani
1d513c845a
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
...
am: 368ae62e9d
2016-08-25 23:13:58 +00:00
Narayan Kamath
a21569cd76
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
...
am: 8f4f9e4d5e
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e
resolve merge conflicts of 5191225 to mnc-dev
...
am: 1fbc4b8624
2016-08-25 23:08:25 +00:00
Sudheer Shanka
86ac88ccdb
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
...
am: 26bb7bf86c
2016-08-25 23:07:49 +00:00
Amith Yamasani
368ae62e9d
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
...
am: 117a383099
2016-08-25 23:07:46 +00:00
Andrew Solovay
0fd07c4e79
docs: Removing non-English /preview/ directories
...
am: 2d629c3e5b
2016-08-25 22:43:21 +00:00
TreeHugger Robot
184edd6d93
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
2016-08-25 21:38:45 +00:00
Mark Lu
30cba33a60
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
2016-08-25 21:34:04 +00:00
Mark Lu
d428a012ba
Merge "docs: fix broken links in Activity reference" into nyc-dev
2016-08-25 21:33:31 +00:00
Mark Lu
209fb02f84
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd
Docs: Fixed the Bluetooth guide link
...
am: 65813dff14
2016-08-25 21:31:56 +00:00
Felipe Leme
cbd6fb206d
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am: 7f9ed1cd85 -s ours
...
am: 3bfa2451d4
2016-08-25 21:09:50 +00:00
Felipe Leme
3bfa2451d4
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
...
am: 7f9ed1cd85
2016-08-25 21:04:35 +00:00
Treehugger Robot
7f9ed1cd85
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
2016-08-25 20:57:25 +00:00
Martijn Coenen
1657493c22
Merge changes from topic 'utf' am: 0a357a1a73
...
am: de8a6a66f6
2016-08-25 20:24:03 +00:00
Martijn Coenen
de8a6a66f6
Merge changes from topic 'utf'
...
am: 0a357a1a73
2016-08-25 20:16:55 +00:00
Martijn Coenen
0a357a1a73
Merge changes from topic 'utf'
...
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
2016-08-25 20:08:14 +00:00
Dianne Hackborn
dd28b7b5f3
Try to mitigate issue #31016187 : system_server crash in ArraySet.
...
Instead of crashing, log a wtf and recover. This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it. So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.
Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit 92aa4b2ba3
2016-08-25 19:49:41 +00:00
Mark Goldstein
1c22ae296b
docs: Fix typo
...
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
2016-08-25 12:48:07 -07:00
Andrew Solovay
2d629c3e5b
docs: Removing non-English /preview/ directories
...
The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.
See first comment for doc stage location.
Change-Id: Ic22652d44696ec2647586e19aa61627d40232239
2016-08-25 12:36:36 -07:00
Ivan.liu
9fb8a51cce
Merge "Fix suspend crash issue on no GPU platform." am: 175621f517
...
am: 98b07f6b55
2016-08-25 18:15:44 +00:00
Ivan.liu
98b07f6b55
Merge "Fix suspend crash issue on no GPU platform."
...
am: 175621f517
2016-08-25 18:09:54 +00:00
