OSDN Git Service
Jeff Sharkey [Wed, 1 Feb 2012 01:25:02 +0000 (17:25 -0800)]
am
02f134aa: Merge "Clear identity when updating network stats."
* commit '
02f134aafd0e77df1b9d6bf9e2c27874702cacf3':
Clear identity when updating network stats.
Mathias Agopian [Wed, 1 Feb 2012 01:24:59 +0000 (17:24 -0800)]
am
dcaf1adc: Merge "fix an issue with vsync event delivery"
* commit '
dcaf1adcb685759bad2b4720b650a63b76b278b9':
fix an issue with vsync event delivery
Mathias Agopian [Wed, 1 Feb 2012 01:24:54 +0000 (17:24 -0800)]
am
b17932fe: Merge "Nexus S now reports the proper frame-rate"
* commit '
b17932fe84f84a660194d25d56ce06324b1bf28d':
Nexus S now reports the proper frame-rate
Dianne Hackborn [Wed, 1 Feb 2012 01:24:50 +0000 (17:24 -0800)]
am
6c997a9e: aapt now sorts the strings in the resource string pool.
* commit '
6c997a9e880e08c354ffd809bd62df9e25e9c4d4':
aapt now sorts the strings in the resource string pool.
Stephen Hines [Wed, 1 Feb 2012 01:24:46 +0000 (17:24 -0800)]
am
2247e3f0: Merge "Test RS struct writing/reading."
* commit '
2247e3f0dc00762b44ef6adcbb2a91c8bbc1be58':
Test RS struct writing/reading.
Jeff Sharkey [Wed, 1 Feb 2012 01:24:37 +0000 (17:24 -0800)]
am
df92772f: Merge "Dump xt_qtaguid stats to using GID instead of su."
* commit '
df92772fb8fc7d7b5b02f3e3bd08250d0fade454':
Dump xt_qtaguid stats to using GID instead of su.
Justin Ho [Wed, 1 Feb 2012 01:24:26 +0000 (17:24 -0800)]
am
7f8ab4b7: am
66146c4f: am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
7f8ab4b786321d8f298e7b4084b099b561481397':
Use LTE SNR and RSRP to set signal level bar.
John Reck [Wed, 1 Feb 2012 01:24:16 +0000 (17:24 -0800)]
am
ae435619: Merge "Support select all"
* commit '
ae4356192e946e01b47db1ebbf571b7d0e2b2830':
Support select all
Jeff Sharkey [Wed, 1 Feb 2012 01:14:14 +0000 (17:14 -0800)]
Merge "Clear identity when updating network stats."
Mathias Agopian [Wed, 1 Feb 2012 00:46:27 +0000 (16:46 -0800)]
Merge "fix an issue with vsync event delivery"
Mathias Agopian [Wed, 1 Feb 2012 00:42:54 +0000 (16:42 -0800)]
fix an issue with vsync event delivery
vsync events were sometimes delivered to connected
client who didn't request them. this happened if
another client requested the delivery and that client
was first in the client list.
also fix the vsync test which didn't request any events as
well as DisplayEventReveiver documentation which was misleading
about the necessity to request vsync events.
Change-Id: Ie990fda3f337f8f0042745c4b2cde67936c45686
Mathias Agopian [Tue, 31 Jan 2012 23:54:20 +0000 (15:54 -0800)]
Merge "Nexus S now reports the proper frame-rate"
Dianne Hackborn [Tue, 31 Jan 2012 19:27:43 +0000 (11:27 -0800)]
aapt now sorts the strings in the resource string pool.
In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).
Also add a new aapt command to print the contents of the resource
table string pool.
Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
Stephen Hines [Tue, 31 Jan 2012 23:32:39 +0000 (15:32 -0800)]
Merge "Test RS struct writing/reading."
Alex Sakhartchouk [Tue, 31 Jan 2012 23:03:29 +0000 (15:03 -0800)]
Merge "Better debugging for shader params." into graphics-dev
Jeff Sharkey [Tue, 31 Jan 2012 22:50:30 +0000 (14:50 -0800)]
Merge "Dump xt_qtaguid stats to using GID instead of su."
Alex Sakhartchouk [Tue, 31 Jan 2012 22:47:10 +0000 (14:47 -0800)]
Merge "Adding a time stamp to transforms to reduce update frequency." into graphics-dev
Justin Ho [Tue, 31 Jan 2012 22:05:26 +0000 (14:05 -0800)]
am
66146c4f: am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d':
Use LTE SNR and RSRP to set signal level bar.
Justin Ho [Tue, 31 Jan 2012 22:02:44 +0000 (14:02 -0800)]
am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
792d83c5087a7a6dec4e64f59f5b78d1041c9585':
Use LTE SNR and RSRP to set signal level bar.
Justin Ho [Tue, 31 Jan 2012 22:00:55 +0000 (14:00 -0800)]
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
John Reck [Tue, 31 Jan 2012 21:41:59 +0000 (13:41 -0800)]
Merge "Support select all"
Romain Guy [Tue, 31 Jan 2012 20:59:28 +0000 (12:59 -0800)]
am
a403a2e0: Merge "Add GradientDrawable.setColors(int[])"
* commit '
a403a2e0f0d55a709821a6310de849176dc9b426':
Add GradientDrawable.setColors(int[])
James Dong [Tue, 31 Jan 2012 20:59:26 +0000 (12:59 -0800)]
am
81bf15ac: Merge "First step of refactoring \'timedtext\' code."
* commit '
81bf15ac36c27f068fe770d32c247673bd98a068':
First step of refactoring 'timedtext' code.
Andreas Huber [Tue, 31 Jan 2012 20:59:24 +0000 (12:59 -0800)]
am
3676974d: Merge "Slighly improve the API to discover if the OMX stack is running in the local"
* commit '
3676974d48f3a4f36c9ab5e79691667f2a79ee7c':
Slighly improve the API to discover if the OMX stack is running in the local
John Reck [Tue, 31 Jan 2012 20:59:21 +0000 (12:59 -0800)]
am
2bb2323d: Merge "Webkit text selection"
* commit '
2bb2323d6361cb7f8cb625caa17c6b0b9e9a626f':
Webkit text selection
Chet Haase [Tue, 31 Jan 2012 20:59:18 +0000 (12:59 -0800)]
am
4125f0b5: Merge "Add new ViewPropertyAnimator utility methods"
* commit '
4125f0b5ce0ac8892b7917e2caf19ae0bb9c2fac':
Add new ViewPropertyAnimator utility methods
Romain Guy [Tue, 31 Jan 2012 20:12:38 +0000 (12:12 -0800)]
Merge "Add GradientDrawable.setColors(int[])"
James Dong [Tue, 31 Jan 2012 20:06:43 +0000 (12:06 -0800)]
Merge "First step of refactoring 'timedtext' code."
Andreas Huber [Tue, 31 Jan 2012 19:27:06 +0000 (11:27 -0800)]
Merge "Slighly improve the API to discover if the OMX stack is running in the local"
John Reck [Tue, 31 Jan 2012 19:08:14 +0000 (11:08 -0800)]
Merge "Webkit text selection"
Chet Haase [Tue, 31 Jan 2012 19:07:25 +0000 (11:07 -0800)]
Merge "Add new ViewPropertyAnimator utility methods"
Romain Guy [Tue, 31 Jan 2012 18:53:35 +0000 (10:53 -0800)]
am
b74b84f1: Merge "Proper equals/hashCode impls in Rect and RectF"
* commit '
b74b84f195e7620415784323c7160afadfcbe9c5':
Proper equals/hashCode impls in Rect and RectF
Romain Guy [Tue, 31 Jan 2012 18:51:38 +0000 (10:51 -0800)]
Merge "Proper equals/hashCode impls in Rect and RectF"
Jeff Brown [Tue, 31 Jan 2012 18:09:34 +0000 (10:09 -0800)]
am
ed734404: Merge "Use O_CLOEXEC when opening input device."
* commit '
ed73440416eac56f20054239d6e8480caae1b6d3':
Use O_CLOEXEC when opening input device.
Jeff Brown [Tue, 31 Jan 2012 18:07:13 +0000 (10:07 -0800)]
am
dd3ba438: Merge "Add basic support for new suspend-block ioctls."
* commit '
dd3ba4384325ca0bb7417073b6a11a991829f2ea':
Add basic support for new suspend-block ioctls.
Jeff Brown [Tue, 31 Jan 2012 18:05:51 +0000 (10:05 -0800)]
Merge "Use O_CLOEXEC when opening input device."
Jeff Brown [Tue, 31 Jan 2012 18:05:09 +0000 (10:05 -0800)]
Merge "Add basic support for new suspend-block ioctls."
Makoto Onuki [Tue, 31 Jan 2012 17:17:11 +0000 (09:17 -0800)]
am
9d36bd02: Merge "Fix 2 broken PhoneNumberUtilsTest."
* commit '
9d36bd02751e2737520524fca03c6f3770bbb731':
Fix 2 broken PhoneNumberUtilsTest.
Makoto Onuki [Tue, 31 Jan 2012 17:14:57 +0000 (09:14 -0800)]
Merge "Fix 2 broken PhoneNumberUtilsTest."
Scott Main [Tue, 31 Jan 2012 17:01:47 +0000 (09:01 -0800)]
am
dfc6cdf7: am
123ffc1f: am
34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '
dfc6cdf7930f889739690217d58797cbf5916c92':
docs: fix locale name; South Africa is local en_ZA external issue 23133
Scott Main [Tue, 31 Jan 2012 17:01:45 +0000 (09:01 -0800)]
am
65831054: am
21e32f20: am
8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
* commit '
658310548bd67dc314123d3a5d2e1dd7f8d92880':
docs: fix typo in market doc external issue 22650
Scott Main [Tue, 31 Jan 2012 16:59:26 +0000 (08:59 -0800)]
am
0aa8f3b8: resolved conflicts for merge of
20d06540 to master
* commit '
0aa8f3b8db3eb97f53dc7fe8f09d5b983300417c':
docs: fix typos and clarify some grammar in summary external issue 21548
Scott Main [Tue, 31 Jan 2012 16:58:51 +0000 (08:58 -0800)]
am
123ffc1f: am
34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '
123ffc1fa40749dd2f2eef94fa1ab0306604b1ae':
docs: fix locale name; South Africa is local en_ZA external issue 23133
Scott Main [Tue, 31 Jan 2012 16:58:49 +0000 (08:58 -0800)]
am
21e32f20: am
8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
* commit '
21e32f209794dffa51ad61e85a3e0b5070593790':
docs: fix typo in market doc external issue 22650
Scott Main [Tue, 31 Jan 2012 16:53:16 +0000 (08:53 -0800)]
resolved conflicts for merge of
20d06540 to master
Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef
Scott Main [Tue, 31 Jan 2012 16:43:45 +0000 (08:43 -0800)]
am
b1bb6659: am
665a6693: am
b86cba15: docs: fix typo in eclipse doc external issue 21475
* commit '
b1bb66592d50b589e3c69115d29c53614a48ad20':
docs: fix typo in eclipse doc external issue 21475
Scott Main [Tue, 31 Jan 2012 16:41:03 +0000 (08:41 -0800)]
am
34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '
34260ad79ede2ed35cc9859095b778f194b9650b':
docs: fix locale name; South Africa is local en_ZA external issue 23133
Scott Main [Tue, 31 Jan 2012 16:41:01 +0000 (08:41 -0800)]
am
8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
* commit '
8bfeb10f98125706d8bb7afa1067ca563e741540':
docs: fix typo in market doc external issue 22650
Scott Main [Tue, 31 Jan 2012 16:40:59 +0000 (08:40 -0800)]
am
665a6693: am
b86cba15: docs: fix typo in eclipse doc external issue 21475
* commit '
665a6693f72460a0d04a5ab70c10dee5493b9df2':
docs: fix typo in eclipse doc external issue 21475
Scott Main [Tue, 31 Jan 2012 16:40:59 +0000 (08:40 -0800)]
am
4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
* commit '
4b2eb9a50bbead0b756944ebffd01c89916896ad':
docs: fix typos and clarify some grammar in summary external issue 21548
Scott Main [Tue, 31 Jan 2012 16:39:36 +0000 (08:39 -0800)]
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:39:03 +0000 (08:39 -0800)]
Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:38:49 +0000 (08:38 -0800)]
am
b86cba15: docs: fix typo in eclipse doc external issue 21475
* commit '
b86cba156c78740793d94444e01d17ef21cb53cc':
docs: fix typo in eclipse doc external issue 21475
Scott Main [Tue, 31 Jan 2012 16:37:59 +0000 (08:37 -0800)]
Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
Andreas Huber [Tue, 31 Jan 2012 16:33:20 +0000 (08:33 -0800)]
am
0056c739: Merge "Make sure our aac decoder handles this parameter."
* commit '
0056c739c5674f7f18d0c8dd2b13b42db97cec5a':
Make sure our aac decoder handles this parameter.
Andreas Huber [Tue, 31 Jan 2012 16:31:03 +0000 (08:31 -0800)]
Merge "Make sure our aac decoder handles this parameter."
Wink Saville [Tue, 31 Jan 2012 14:42:03 +0000 (06:42 -0800)]
am
cec507f2: Merge "Display roaming indicator icon only based on ERI in CDMA case."
* commit '
cec507f23596dddf88caaac1ebc427e7b2c7ae4b':
Display roaming indicator icon only based on ERI in CDMA case.
Wink Saville [Tue, 31 Jan 2012 14:39:52 +0000 (06:39 -0800)]
Merge "Display roaming indicator icon only based on ERI in CDMA case."
Ben Murdoch [Tue, 31 Jan 2012 10:19:22 +0000 (02:19 -0800)]
am
145b3407: Merge "Remove code that quits the webcore watchdog thread."
* commit '
145b340773b4675df5eff586b137627c6c38369b':
Remove code that quits the webcore watchdog thread.
Ben Murdoch [Tue, 31 Jan 2012 10:17:12 +0000 (02:17 -0800)]
Merge "Remove code that quits the webcore watchdog thread."
Mathias Agopian [Tue, 31 Jan 2012 04:01:18 +0000 (20:01 -0800)]
am
9eb95992: fix a race condition in eglMakeCurrent()
* commit '
9eb95992ea34e40e83d78f5c211933246c491f0f':
fix a race condition in eglMakeCurrent()
Mathias Agopian [Tue, 31 Jan 2012 02:45:15 +0000 (18:45 -0800)]
Nexus S now reports the proper frame-rate
don't hardcode it.
Change-Id: I4b37f37a9809cac937e6334c988b3185af2ebe22
Mathias Agopian [Tue, 31 Jan 2012 02:20:52 +0000 (18:20 -0800)]
fix a race condition in eglMakeCurrent()
it would happen when a context was made non-current, in this
case we would call the implementation's eglMakeCurrent() which
would succeed, if we're rescheduled at that point, another
eglMakeCurrent() could make that context current to another thread,
however, when we came back to the original call we would
overwrite egl_context_t internal state.
this is fixed by moving the critical section under
egl_display_t's lock.
Change-Id: I743c85696e13263d3a9570824940263df0caacdc
Mathias Agopian [Tue, 31 Jan 2012 01:45:28 +0000 (17:45 -0800)]
am
11c5db5e: Merge "add all needed GL extension wrappers"
* commit '
11c5db5e29f9e4ac4cdb0bb49197b48deb657e36':
add all needed GL extension wrappers
Romain Guy [Tue, 31 Jan 2012 01:45:25 +0000 (17:45 -0800)]
am
1e56fff3: Merge "Add debug markers to OpenGLRenderer"
* commit '
1e56fff3b90946b342ddabf68648dc3551ce47db':
Add debug markers to OpenGLRenderer
Mathias Agopian [Tue, 31 Jan 2012 01:44:09 +0000 (17:44 -0800)]
Merge "add all needed GL extension wrappers"
Romain Guy [Tue, 31 Jan 2012 01:43:37 +0000 (17:43 -0800)]
Merge "Add debug markers to OpenGLRenderer"
Mathias Agopian [Tue, 31 Jan 2012 01:40:29 +0000 (17:40 -0800)]
add all needed GL extension wrappers
when increasing MAX_NUMBER_OF_GL_EXTENSIONS to 256
we also needed to create all the corresponding wrappers.
Change-Id: I90edaaf0885ccdfab48e7a1396bcf88e039cfb25
Gilles Debunne [Tue, 31 Jan 2012 01:03:54 +0000 (17:03 -0800)]
am
79e3e5f5: Merge "Removed SoftInputShownOnFocus methods in TextView"
* commit '
79e3e5f5d4e8260db8a60f120471ce3ec91f8981':
Removed SoftInputShownOnFocus methods in TextView
Gilles Debunne [Tue, 31 Jan 2012 01:01:19 +0000 (17:01 -0800)]
Merge "Removed SoftInputShownOnFocus methods in TextView"
Svetoslav Ganov [Tue, 31 Jan 2012 00:39:53 +0000 (16:39 -0800)]
am
12df3cf1: Merge "Incorrect behavior of View clear focus."
* commit '
12df3cf156885a421beccfa6b6e20fd1a188847a':
Incorrect behavior of View clear focus.
Svetoslav Ganov [Tue, 31 Jan 2012 00:37:33 +0000 (16:37 -0800)]
Merge "Incorrect behavior of View clear focus."
Scott Main [Tue, 31 Jan 2012 00:20:41 +0000 (16:20 -0800)]
am
f68af846: am
6e4f886d: am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
f68af846d472e59f1a8280f250a1f0b9ac13abd9':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:18:54 +0000 (16:18 -0800)]
am
6e4f886d: am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
6e4f886db034b954a305611cc71a10ff7d1c75ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:15:29 +0000 (16:15 -0800)]
am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:13:28 +0000 (16:13 -0800)]
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
Scott Main [Mon, 30 Jan 2012 23:31:15 +0000 (15:31 -0800)]
am
275345b0: am
a76ddf92: am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
275345b0871c6b269709c3d6a25d9fae03f7922a':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Mathias Agopian [Mon, 30 Jan 2012 23:28:45 +0000 (15:28 -0800)]
am
7ff542c1: Merge "SF now synchronizes to VSYNC"
* commit '
7ff542c1ae2436bac90669f18d034f369236c5ab':
SF now synchronizes to VSYNC
Eric Fischer [Mon, 30 Jan 2012 23:28:43 +0000 (15:28 -0800)]
am
47848567: Merge "Import translations. DO NOT MERGE"
* commit '
478485678a4898ed2da7a17adb1ba3d98ad6fff8':
Import translations. DO NOT MERGE
Scott Main [Mon, 30 Jan 2012 23:28:36 +0000 (15:28 -0800)]
am
a76ddf92: am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
a76ddf927278ec36f5a4589dbba85bb06bb1ae19':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Mathias Agopian [Mon, 30 Jan 2012 23:26:15 +0000 (15:26 -0800)]
am
818b4236: Merge "add support for GL_EXT_debug_marker"
* commit '
818b4236586d0dda696f363f1065c8f8abd64862':
add support for GL_EXT_debug_marker
Mathias Agopian [Mon, 30 Jan 2012 23:24:46 +0000 (15:24 -0800)]
Merge "SF now synchronizes to VSYNC"
Eric Fischer [Mon, 30 Jan 2012 23:24:41 +0000 (15:24 -0800)]
Merge "Import translations. DO NOT MERGE"
Mathias Agopian [Mon, 30 Jan 2012 23:23:47 +0000 (15:23 -0800)]
Merge "add support for GL_EXT_debug_marker"
Mathias Agopian [Wed, 25 Jan 2012 00:39:14 +0000 (16:39 -0800)]
SF now synchronizes to VSYNC
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
Scott Main [Mon, 30 Jan 2012 23:14:53 +0000 (15:14 -0800)]
am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
6507df8b78d80403d66d321748ad47290a611e3f':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Alex Sakhartchouk [Mon, 30 Jan 2012 22:24:04 +0000 (14:24 -0800)]
Merge "Fixing possible pne." into graphics-dev
Romain Guy [Mon, 30 Jan 2012 22:15:30 +0000 (14:15 -0800)]
am
a585e8db: Merge "Always initialize AsyncTask on the main thread."
* commit '
a585e8dbcf33a9cfcca725b994a22e6d78d427f9':
Always initialize AsyncTask on the main thread.
Romain Guy [Mon, 30 Jan 2012 22:12:37 +0000 (14:12 -0800)]
Merge "Always initialize AsyncTask on the main thread."
The Android Open Source Project [Mon, 30 Jan 2012 21:42:59 +0000 (13:42 -0800)]
am
c7d75153: am
827a597d: Reconcile with ics-mr1-release
* commit '
c7d7515325e9ef827feb094dbf42f1c920ad7936':
Revert "Fix
5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
The Android Open Source Project [Mon, 30 Jan 2012 21:38:52 +0000 (13:38 -0800)]
am
827a597d: Reconcile with ics-mr1-release
* commit '
827a597df70a51c6cccad52fae2be2c469f58b77':
Revert "Fix
5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Gilles Debunne [Mon, 30 Jan 2012 21:01:18 +0000 (13:01 -0800)]
am
a8217330: Merge "Remove onPreDrawListeners earlier in TextView"
* commit '
a82173305991a24bc1400149b41bb998a6f50b38':
Remove onPreDrawListeners earlier in TextView
Dianne Hackborn [Mon, 30 Jan 2012 20:58:56 +0000 (12:58 -0800)]
am
a6989484: am
25fe8ef1: am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
a69894846c0e34228da71dccf4e8ef5ae95a45a3':
Update documentation to reflect the old approach not working.
Gilles Debunne [Mon, 30 Jan 2012 20:58:53 +0000 (12:58 -0800)]
Merge "Remove onPreDrawListeners earlier in TextView"
Alex Sakhartchouk [Mon, 30 Jan 2012 20:57:40 +0000 (12:57 -0800)]
Merge "Making the SceneGraph more robust to make sure data is propagated to RS. Caching RS name allocations." into graphics-dev
Dianne Hackborn [Mon, 30 Jan 2012 20:56:42 +0000 (12:56 -0800)]
am
25fe8ef1: am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:54:02 +0000 (12:54 -0800)]
am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
e22f4748565915948c8af2961ac74fe81a417e3b':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1