Glenn Kasten
|
3477a8cff2
|
Merge "Bug 3362814 Fix SMP race in access to mRequestExit"
|
2011-02-24 10:01:31 -08:00 |
|
Glenn Kasten
|
99cdf2d9ba
|
Merge "Don't crash when parsing DRM MIME types"
|
2011-02-24 08:17:02 -08:00 |
|
Kristian Monsen
|
820a58675d
|
Merge "Hiding deprecated classes and methods"
|
2011-02-24 08:02:34 -08:00 |
|
Derek Sollenberger
|
a467e15fb6
|
Merge "Skia Merge (revision 808)"
|
2011-02-24 05:27:34 -08:00 |
|
Wu-cheng Li
|
e2a148fae7
|
Merge "Add YV12 preview format to camera parameter constants."
|
2011-02-24 02:51:17 -08:00 |
|
Xavier Ducrohet
|
4e9e637400
|
Merge "LayoutLib: Add debug mode."
|
2011-02-23 18:32:15 -08:00 |
|
Xavier Ducrohet
|
15081dcff5
|
Merge "LayoutLib: downsize the SparseArray when possible."
|
2011-02-23 18:32:10 -08:00 |
|
Jason Chen
|
83bc093ce8
|
am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
|
2011-02-23 18:11:21 -08:00 |
|
Jason Chen
|
cba9291560
|
am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
|
2011-02-23 18:08:23 -08:00 |
|
Irfan Sheriff
|
9230bf3b9a
|
am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
DO NOT MERGE Add support for background scanning
|
2011-02-23 18:06:02 -08:00 |
|
Jason Chen
|
0b270d3d0e
|
am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
|
2011-02-23 18:03:34 -08:00 |
|
Irfan Sheriff
|
48f8e87419
|
am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
|
2011-02-23 18:02:45 -08:00 |
|
Glenn Kasten
|
7e453a51a5
|
Bug 3362814 Fix SMP race in access to mRequestExit
Also fix an unlikely SMP race in access to mHoldSelf on entry to _threadLoop.
Change-Id: I6cbc0b94739c7dd5e77e8a5ba0da22cdc0b1a4db
|
2011-02-23 17:49:59 -08:00 |
|
Michael Kolb
|
150e24fe4e
|
Merge "make @hide actually hide"
|
2011-02-23 17:44:43 -08:00 |
|
Jason Chen
|
9281fda8e0
|
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
|
2011-02-23 17:23:53 -08:00 |
|
Irfan Sheriff
|
fe35362c3a
|
Merge "DO NOT MERGE Add support for background scanning" into honeycomb
|
2011-02-23 16:59:55 -08:00 |
|
Chet Haase
|
8956860efc
|
Merge "Fix bug with bad state in animators"
|
2011-02-23 16:59:03 -08:00 |
|
Irfan Sheriff
|
3083963167
|
Merge "Remove backup of sleep policy setting"
|
2011-02-23 16:54:55 -08:00 |
|
John Reck
|
04b32c19d5
|
Merge "Add x- header to prevent url logging in incognito"
|
2011-02-23 16:50:24 -08:00 |
|
Mike Lockwood
|
8d320e7259
|
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
|
2011-02-23 16:40:12 -08:00 |
|
Romain Guy
|
7e18b2c019
|
Merge "More documentation for Canvas.drawArc()"
|
2011-02-23 16:32:16 -08:00 |
|
Jason Sams
|
8b03bb20e1
|
Merge "fix bug 3477451 Bogus asserts with pure compute scripts."
|
2011-02-23 16:29:41 -08:00 |
|
Kenny Root
|
58fb00eac8
|
Merge "Fix measurement of external media dir"
|
2011-02-23 16:27:10 -08:00 |
|
Romain Guy
|
4652e6afc9
|
Merge "A bit more doc for ListAdapter#areAllItemsEnabled()."
|
2011-02-23 16:04:07 -08:00 |
|
Scott Main
|
635f2cb58c
|
am b1eea45a: am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
* commit 'b1eea45a71a3fffe3014bbe84226df3c57ddbafc':
docs: fix sensorevent code snippets bug: 3480932
|
2011-02-23 16:02:13 -08:00 |
|
Scott Main
|
05f5f4e91b
|
am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
* commit '201959af6e61c148576c77de6cf772456d664251':
docs: fix sensorevent code snippets bug: 3480932
|
2011-02-23 16:00:08 -08:00 |
|
Scott Main
|
096db9ec94
|
Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
|
2011-02-23 15:58:13 -08:00 |
|
Romain Guy
|
1c033e356b
|
Merge "Add dither XML attribute support to Gradient and ShapeDrawable."
|
2011-02-23 15:57:19 -08:00 |
|
Jaikumar Ganesh
|
bbcc437515
|
Merge "Make BluetoothPan inherit from BluetoothProfile."
|
2011-02-23 15:50:57 -08:00 |
|
Eric Fischer
|
edcb876cdc
|
am bb0c1a36: (-s ours) am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
Import revised translations. DO NOT MERGE
|
2011-02-23 15:38:38 -08:00 |
|
Eric Fischer
|
d189adf1bf
|
am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
Import revised translations. DO NOT MERGE
|
2011-02-23 15:36:08 -08:00 |
|
Eric Fischer
|
5705228fb0
|
Merge "Import revised translations. DO NOT MERGE" into honeycomb
|
2011-02-23 15:33:12 -08:00 |
|
Mathias Agopian
|
e364df5a5a
|
Merge "Remove RefBase.h dependency on TextOutput.h"
|
2011-02-23 15:23:13 -08:00 |
|
Irfan Sheriff
|
a2b2e7ddce
|
am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
DO NOT MERGE No backup of country and sleep policy
|
2011-02-23 14:41:01 -08:00 |
|
Irfan Sheriff
|
c0be04416a
|
am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
DO NOT MERGE No backup of country and sleep policy
|
2011-02-23 14:38:10 -08:00 |
|
Irfan Sheriff
|
5ebcc6f061
|
Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
|
2011-02-23 14:35:20 -08:00 |
|
Scott Main
|
db38d28117
|
am 63a4f9f5: am c516c771: docs: fix md5 sums
* commit '63a4f9f5e66e5fa38ed798c8cbcc44f623e42ec0':
docs: fix md5 sums
|
2011-02-23 14:19:48 -08:00 |
|
Scott Main
|
03caa35f6a
|
am c516c771: docs: fix md5 sums
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
docs: fix md5 sums
|
2011-02-23 14:17:30 -08:00 |
|
Gloria Wang
|
76f1cea2da
|
Merge "To collect the total usage time of encoders in the media recorder"
|
2011-02-23 14:12:33 -08:00 |
|
Eric Hassold
|
ab0225e330
|
Merge "Correctly handle translucency of device-specific pixel formats"
|
2011-02-23 14:10:04 -08:00 |
|
Jamie Gennis
|
828f26a216
|
am 20bfbd95: am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '20bfbd9544dcb36f967c93a63842ecea92e82f22':
egl: fixes for object refcounts
|
2011-02-23 13:37:34 -08:00 |
|
Jamie Gennis
|
38b95b07cf
|
am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
egl: fixes for object refcounts
|
2011-02-23 13:31:12 -08:00 |
|
Xia Wang
|
1098c8a6d5
|
Merge "Remove long sleep time in WifiApStress test as it causes the test to run for a long time."
|
2011-02-23 13:19:24 -08:00 |
|
Jamie Gennis
|
a5c7de658a
|
am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
egl: fixes for object refcounts
|
2011-02-23 12:46:57 -08:00 |
|
Jamie Gennis
|
8a5d77b8e5
|
Merge "egl: fixes for object refcounts" into gingerbread
|
2011-02-23 12:30:55 -08:00 |
|
Scott Main
|
25441423a7
|
am 02be2f1d: am 2788e4f9: docs: fix some typos
* commit '02be2f1d874078f227af34fcac7863eca1f35653':
docs: fix some typos
|
2011-02-23 11:27:12 -08:00 |
|
Scott Main
|
43e081b357
|
am 2788e4f9: docs: fix some typos
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
docs: fix some typos
|
2011-02-23 11:24:42 -08:00 |
|
Romain Guy
|
91218bf293
|
Merge "Don't swap bottom left and bottom right corner radii."
|
2011-02-23 11:20:34 -08:00 |
|
Leon Scroggins
|
768f9877f2
|
Merge "New flag to open intent in a new tab."
|
2011-02-23 11:20:05 -08:00 |
|
Irfan Sheriff
|
eb7a99fdcd
|
Merge "Add support for background scanning"
|
2011-02-23 10:41:12 -08:00 |
|