Guang Zhu
8de3e4d25f
Merge "call clearCache from UI thread"
2011-05-18 14:21:29 -07:00
Fabrice Di Meglio
9d58118da5
Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"
2011-05-18 12:50:34 -07:00
Dianne Hackborn
a28d034e54
am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
Improve compat mode scaling implementation.
2011-05-18 10:36:14 -07:00
Adam Powell
ec9ee068e5
resolved conflicts for merge of f61c3d07 to master
...
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
2011-05-18 10:33:20 -07:00
Katie McCormick
661609c43b
am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '2c898da6d3306e041da0165607555303203ec86d':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-18 10:25:02 -07:00
Andreas Huber
58fab0fb84
Merge "Properly forward rotation information from input format to output format."
2011-05-18 09:40:52 -07:00
Mike Lockwood
b516243262
am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
StorageVolume: Add getStorageId() accessor
2011-05-18 09:23:35 -07:00
John Reck
10db34a1bb
am c54d3a98: am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit 'c54d3a987235c615715e45f5a22ba75e6fae22b3':
Don't use mobile for large uastring
2011-05-18 09:23:22 -07:00
Eric Fischer
c2c0075aa3
am 49ac7418: (-s ours) am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '49ac741841224b9ff2579f6b7722dc7eb0ebcd3a':
Import revised translations. DO NOT MERGE
2011-05-18 09:21:13 -07:00
Eino-Ville Talvala
34526db89b
Merge "Add auto-white balance locking to the Camera API."
2011-05-18 08:54:40 -07:00
Mike Lockwood
f27b62fb90
resolved conflicts for merge of 22c140b7 to master
...
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
2011-05-18 09:25:49 -04:00
Wink Saville
24139dd2b0
Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"
2011-05-17 23:32:01 -07:00
Dianne Hackborn
82585bc313
am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
Improve compat mode scaling implementation.
2011-05-17 18:42:23 -07:00
Dianne Hackborn
c9ba3c8870
am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
2011-05-17 18:40:12 -07:00
Dianne Hackborn
0265a6ba75
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
8c00064be1
am 16c69222: am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '16c692229d6ed3d0df8682884b35252ea72c7c26':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:34:49 -07:00
Adam Powell
8fe8db60fe
am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:32:06 -07:00
Adam Powell
39bbfc22a9
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Katie McCormick
b8fec16e1b
am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '32638ccb66d933512f4792d120b5cd93e9a26537':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:47:48 -07:00
Katie McCormick
a46e385cf1
am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:40:38 -07:00
Katie McCormick
cdb8f8f181
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00
Eric Fischer
202d1e91ba
Merge "Import revised translations."
2011-05-17 17:14:56 -07:00
Mike Lockwood
619f940d6c
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:49:40 -07:00
John Reck
e0b3f81c29
am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1818b4a99016486d42de1a2ff35c88bb3197cd20':
Don't use mobile for large uastring
2011-05-17 16:49:25 -07:00
Mike Lockwood
62f5c48e9c
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00
Mike Lockwood
77656e2961
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -07:00
John Reck
4af6883894
am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1147bf638a791ef403c0cc6654f4decd1b0d67c1':
Don't use mobile for large uastring
2011-05-17 16:18:11 -07:00
Alex Sakhartchouk
9de073cc8a
Merge "Moves fbo support in renderscript behind the hal"
2011-05-17 15:40:29 -07:00
Jamie Gennis
62c530f147
Merge "SurfaceFlinger: unfreeze windows for fixed size buffers."
2011-05-17 15:13:35 -07:00
Jaikumar Ganesh
0cff374d7f
Merge "Improve locking granularity for PAN and Input."
2011-05-17 15:12:00 -07:00
Romain Guy
9dbff77e6b
Merge "Improve LayoutInflater's compliance."
2011-05-17 15:06:09 -07:00
Jason Sams
77a992e4eb
Merge "Core to client fifo on sockets."
2011-05-17 15:05:50 -07:00
Brian Carlstrom
dd946194ef
Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)"
2011-05-17 14:57:31 -07:00
Fabrice Di Meglio
66826dbe90
Merge "View horizontalDirection public attribute resolution to an internal var."
2011-05-17 14:16:43 -07:00
Chet Haase
39bede87fc
Merge "Fix for using HARDWARE layers on unaccelerated views."
2011-05-17 14:00:53 -07:00
Adam Powell
170bcc4b25
Merge "resolved conflicts for merge of 2b6ace58 to master"
2011-05-17 13:57:07 -07:00
James Dong
596982fff8
Merge "Make track informational event optional, depending on system property"
2011-05-17 13:41:42 -07:00
Adam Powell
cdce06d931
resolved conflicts for merge of 2b6ace58 to master
...
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
2011-05-17 13:41:24 -07:00
Eric Fischer
590ffda086
am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'd9703697b20b666112a27d904db5fbaf391b3dd2':
Import revised translations. DO NOT MERGE
2011-05-17 13:31:48 -07:00
Eric Fischer
00c777748f
am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'da4809455716cf16451ca5db79654370a6a44f17':
Import revised translations. DO NOT MERGE
2011-05-17 13:27:59 -07:00
Eric Fischer
37ce5ab46d
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Mike Lockwood
aace777cd5
am 798df16e: am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '798df16e3a3920ba55d7abc7ed10def6a17132bf':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:14:32 -07:00
Mike Lockwood
8973de98b0
am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:12:32 -07:00
Jeff Sharkey
d4cbb9db8a
Merge "First pass at NetworkPolicy and activity tracking."
2011-05-17 12:27:01 -07:00
Adam Powell
6cc063af34
am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
Prevent cases of bogus action bar measurement.
2011-05-17 12:21:22 -07:00
Adam Powell
edc63bcdb5
am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
d1438416be
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Scott Main
5a7dbe3a25
am 092aac23: am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit '092aac23cef95ca4372a815210ff448b9c919aa4':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:55:13 -07:00
Scott Main
548ae88d82
am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit '8a769dd1e3a328860c541faf56a6e676bf1dc01c':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:50:51 -07:00
Scott Main
8e6b8a7366
am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:22:49 -07:00