OSDN Git Service
Jeff Sharkey [Wed, 30 Nov 2011 22:03:04 +0000 (14:03 -0800)]
am
cf5b90b4: Merge "Clean up InterfaceConfiguration flags."
* commit '
cf5b90b45cbfe994661f2087fedc9aee80e95763':
Clean up InterfaceConfiguration flags.
Steve Block [Wed, 30 Nov 2011 22:03:00 +0000 (14:03 -0800)]
am
6a8c48f6: Merge "Clean up JavaDoc for GeolocationPermissions"
* commit '
6a8c48f6aaead268a517573d7cd0199ee5677a52':
Clean up JavaDoc for GeolocationPermissions
Dianne Hackborn [Wed, 30 Nov 2011 22:02:39 +0000 (14:02 -0800)]
am
ed032e78: am
500862b4: am
1808f214: Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '
ed032e78733afab4bf49d80da1a38fb06bf99622':
Fix issue #
5636525: ANR observed in setup wizard after changing language
Teng-Hui Zhu [Wed, 30 Nov 2011 22:02:37 +0000 (14:02 -0800)]
am
0e9f0c3e: am
e9dc400c: am
d3788b97: Merge "WebView animation support" into ics-mr1
* commit '
0e9f0c3e13d49a044835a05cf514b9f81dd7b28a':
WebView animation support
Romain Guy [Wed, 30 Nov 2011 22:02:34 +0000 (14:02 -0800)]
am
9e81c791: am
7e6077c7: am
a9a91ad3: Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
* commit '
9e81c791afe5db7e3ee78d99628a9ee7a8fe0df0':
Improve screenshot animation performance Bug #
5525888
Andreas Huber [Wed, 30 Nov 2011 22:02:26 +0000 (14:02 -0800)]
am
7ba11ef4: Merge "resolved conflicts for merge of
3d630e86 to master"
* commit '
7ba11ef4a00a98068a16b8d75600886ee4a910cc':
Make sure we can properly shutdown even if
Nick Kralevich [Wed, 30 Nov 2011 22:02:19 +0000 (14:02 -0800)]
am
cdc8a01e: Merge "allow dumpstate to work with dmesg_restrict=1"
* commit '
cdc8a01e26d538e9fcc4e7c4dac86e30b76d70a1':
allow dumpstate to work with dmesg_restrict=1
Narayan Kamath [Wed, 30 Nov 2011 22:01:57 +0000 (14:01 -0800)]
am
7a44d682: Merge "Allow multiple TextToSpeech instances per calling app."
* commit '
7a44d68249d64585c55ad7525ff2271f853850ac':
Allow multiple TextToSpeech instances per calling app.
Wu-cheng Li [Wed, 30 Nov 2011 22:01:53 +0000 (14:01 -0800)]
am
12f3e285: Merge "Add a method to get empty camera parameters."
* commit '
12f3e28544b00ff4b073cc8ac1b277f0c7a93aab':
Add a method to get empty camera parameters.
Wu-cheng Li [Wed, 30 Nov 2011 22:01:44 +0000 (14:01 -0800)]
am
02097523: Fix compile error in android_hardware_Camera.cpp.
* commit '
020975236c53fe2eeb1ada57f27258802858d98f':
Fix compile error in android_hardware_Camera.cpp.
Wu-cheng Li [Wed, 30 Nov 2011 22:01:42 +0000 (14:01 -0800)]
am
b4123ef0: Merge "Add camera focus move callback."
* commit '
b4123ef0f9cc52b329fe2564213bc2b8bc19ef4a':
Add camera focus move callback.
Steven Ross [Wed, 30 Nov 2011 22:01:40 +0000 (14:01 -0800)]
am
f0f2d243: Merge "Display max retry lockout message on backup lock fixes
5462647"
* commit '
f0f2d2438c01b42983ec57dd8d2bbab11733c147':
Display max retry lockout message on backup lock fixes
5462647
James Dong [Wed, 30 Nov 2011 22:01:33 +0000 (14:01 -0800)]
am
44ddd1ff: Fix the broken build
* commit '
44ddd1ff887395d747ded17f1f6b52f059320fcd':
Fix the broken build
Jeff Sharkey [Wed, 30 Nov 2011 18:20:07 +0000 (10:20 -0800)]
Merge "Clean up InterfaceConfiguration flags."
Steve Block [Wed, 30 Nov 2011 18:04:36 +0000 (10:04 -0800)]
Merge "Clean up JavaDoc for GeolocationPermissions"
Dianne Hackborn [Wed, 30 Nov 2011 17:58:18 +0000 (09:58 -0800)]
am
500862b4: am
1808f214: Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '
500862b44c8ecbb867144781239bd55b6d3c9489':
Fix issue #
5636525: ANR observed in setup wizard after changing language
Teng-Hui Zhu [Wed, 30 Nov 2011 17:58:02 +0000 (09:58 -0800)]
am
e9dc400c: am
d3788b97: Merge "WebView animation support" into ics-mr1
* commit '
e9dc400c080577b74a59085f9c2428c92ee21e16':
WebView animation support
Romain Guy [Wed, 30 Nov 2011 17:57:57 +0000 (09:57 -0800)]
am
7e6077c7: am
a9a91ad3: Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
* commit '
7e6077c73999d906aa84b8dd4344bab996c75080':
Improve screenshot animation performance Bug #
5525888
Andreas Huber [Wed, 30 Nov 2011 17:55:47 +0000 (09:55 -0800)]
Merge "resolved conflicts for merge of
3d630e86 to master"
Nick Kralevich [Wed, 30 Nov 2011 17:55:06 +0000 (09:55 -0800)]
Merge "allow dumpstate to work with dmesg_restrict=1"
Andreas Huber [Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)]
resolved conflicts for merge of
3d630e86 to master
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
Andreas Huber [Wed, 30 Nov 2011 15:49:26 +0000 (07:49 -0800)]
am
e7b3e09a: am
52607c53: am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
e7b3e09a5ed21dab938a7efdc215bb20d2769702':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Wed, 30 Nov 2011 15:49:24 +0000 (07:49 -0800)]
am
848bffd8: am
074133b2: am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
848bffd8fa07f0e16d0ac5eed95085288ff43d9f':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Wed, 30 Nov 2011 15:49:20 +0000 (07:49 -0800)]
am
baeda513: Merge "resolved conflicts for merge of
998a929a to master"
* commit '
baeda5135bb1b4a87334c41834f3532ab73a4022':
Finer granularity discontinuity support.
Jeff Sharkey [Wed, 30 Nov 2011 15:49:16 +0000 (07:49 -0800)]
am
b468a8fd: Merge "Move NativeDaemonConnector to varargs."
* commit '
b468a8fd2b6fba095372afef9272024c9385688d':
Move NativeDaemonConnector to varargs.
Irfan Sheriff [Wed, 30 Nov 2011 15:49:12 +0000 (07:49 -0800)]
am
a5d24d42: Merge "Redesign p2p around provision discovery"
* commit '
a5d24d42ff8b99383a8c3051b9459e5248cf8536':
Redesign p2p around provision discovery
Narayan Kamath [Wed, 30 Nov 2011 10:45:22 +0000 (02:45 -0800)]
Merge "Allow multiple TextToSpeech instances per calling app."
Wu-cheng Li [Wed, 30 Nov 2011 08:47:01 +0000 (00:47 -0800)]
Merge "Add a method to get empty camera parameters."
Wu-cheng Li [Wed, 30 Nov 2011 02:45:06 +0000 (18:45 -0800)]
Merge "Add camera focus move callback."
Steven Ross [Wed, 30 Nov 2011 02:34:50 +0000 (18:34 -0800)]
Merge "Display max retry lockout message on backup lock fixes
5462647"
Andreas Huber [Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)]
am
52607c53: am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Wed, 30 Nov 2011 00:33:02 +0000 (16:33 -0800)]
am
074133b2: am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Wed, 30 Nov 2011 00:31:17 +0000 (16:31 -0800)]
Merge "resolved conflicts for merge of
998a929a to master"
Jeff Sharkey [Tue, 29 Nov 2011 23:31:59 +0000 (15:31 -0800)]
Merge "Move NativeDaemonConnector to varargs."
Dianne Hackborn [Tue, 29 Nov 2011 23:30:08 +0000 (15:30 -0800)]
am
1808f214: Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '
1808f214b0cd7a62628b273b93a1ea688f262565':
Fix issue #
5636525: ANR observed in setup wizard after changing language
Dianne Hackborn [Tue, 29 Nov 2011 23:28:41 +0000 (15:28 -0800)]
Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 23:14:44 +0000 (15:14 -0800)]
resolved conflicts for merge of
998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
Irfan Sheriff [Tue, 29 Nov 2011 22:52:18 +0000 (14:52 -0800)]
Merge "Redesign p2p around provision discovery"
Teng-Hui Zhu [Tue, 29 Nov 2011 22:21:10 +0000 (14:21 -0800)]
am
d3788b97: Merge "WebView animation support" into ics-mr1
* commit '
d3788b97c9a28e8cbfa4432389a5de04073a333b':
WebView animation support
Teng-Hui Zhu [Tue, 29 Nov 2011 22:18:27 +0000 (14:18 -0800)]
Merge "WebView animation support" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 22:16:59 +0000 (14:16 -0800)]
am
a9a91ad3: Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
* commit '
a9a91ad356271c4c4d663223ff42694fbeb1d2a0':
Improve screenshot animation performance Bug #
5525888
Romain Guy [Tue, 29 Nov 2011 22:14:44 +0000 (14:14 -0800)]
Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:12:21 +0000 (14:12 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)]
am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
d12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Tue, 29 Nov 2011 22:12:18 +0000 (14:12 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:10:09 +0000 (14:10 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:13 +0000 (14:08 -0800)]
Merge "Finer granularity discontinuity support." into ics-mr1
Chet Haase [Tue, 29 Nov 2011 21:56:23 +0000 (13:56 -0800)]
am
b7a4db0a: Merge "Fix invalidation of transformed, opaque views"
* commit '
b7a4db0a53cff6162d6981f9657a2ac70925ad73':
Fix invalidation of transformed, opaque views
Chet Haase [Tue, 29 Nov 2011 21:53:53 +0000 (13:53 -0800)]
Merge "Fix invalidation of transformed, opaque views"
Jeff Brown [Tue, 29 Nov 2011 21:20:17 +0000 (13:20 -0800)]
am
0475f82c: am
c339fe30: am
be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit '
0475f82c95e6e9657580820b16b0e48d814119b5':
Fix application launch shortcuts.
Jeff Brown [Tue, 29 Nov 2011 21:17:42 +0000 (13:17 -0800)]
am
c339fe30: am
be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit '
c339fe302bc5083f0a110569eec06676be511088':
Fix application launch shortcuts.
Jeff Brown [Tue, 29 Nov 2011 21:15:51 +0000 (13:15 -0800)]
am
be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit '
be6ab576ff0e3bf2a8dc3feee6f476061afbda30':
Fix application launch shortcuts.
Mathias Agopian [Tue, 29 Nov 2011 21:15:33 +0000 (13:15 -0800)]
am
8e6115f6: Merge "Add support for sending VSYNC events to the framework"
* commit '
8e6115f622ee2d6ef8023357231b6663b1c091e6':
Add support for sending VSYNC events to the framework
Jeff Brown [Tue, 29 Nov 2011 21:13:33 +0000 (13:13 -0800)]
Merge "Fix application launch shortcuts." into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 21:13:03 +0000 (13:13 -0800)]
am
123ad282: am
3788ce9e: am
50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
* commit '
123ad2823b1b60b33228f5b39f24139def4e2236':
Another attempt at getting OOM reports to batch.
Mathias Agopian [Tue, 29 Nov 2011 21:12:32 +0000 (13:12 -0800)]
Merge "Add support for sending VSYNC events to the framework"
Dianne Hackborn [Tue, 29 Nov 2011 21:11:12 +0000 (13:11 -0800)]
am
3788ce9e: am
50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
* commit '
3788ce9ed9b896c2f1d5500910e949a6eba308e2':
Another attempt at getting OOM reports to batch.
Mathias Agopian [Tue, 29 Nov 2011 21:10:51 +0000 (13:10 -0800)]
Mathias Agopian [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]
Add support for sending VSYNC events to the framework
use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.
Bug:
1475048
Change-Id: Ia720f64d1b950328b47b22c6a86042e481d35f09
Dianne Hackborn [Tue, 29 Nov 2011 21:09:03 +0000 (13:09 -0800)]
am
50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
* commit '
50b2042502bc459b40430fe3b3b83d7d61e5daf9':
Another attempt at getting OOM reports to batch.
Mathias Agopian [Tue, 29 Nov 2011 21:07:24 +0000 (13:07 -0800)]
Fix build.
Revert "Add support for sending VSYNC events to the framework"
This reverts commit
f3918c5bd4bc9f02f74da42995564150ca2dd382.
Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f
Dianne Hackborn [Tue, 29 Nov 2011 21:05:26 +0000 (13:05 -0800)]
Merge "Another attempt at getting OOM reports to batch." into ics-mr1
Jeff Brown [Mon, 28 Nov 2011 20:59:11 +0000 (12:59 -0800)]
Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.
Added a set of Intent categories for typical applications on the
platform.
Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys. Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos. The goal is to encourage them
to stop doing this by implementing more of HID.
Bug:
5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
Eric Fischer [Tue, 29 Nov 2011 19:54:01 +0000 (11:54 -0800)]
am
e11ec1df: am
47af771d: (-s ours) am
9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
e11ec1df421be0b1a18fd3cf6ec23361d86ca32a':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 19:51:20 +0000 (11:51 -0800)]
am
47af771d: (-s ours) am
9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
47af771d708c8eb8f7debf7e295d609491f03cc8':
Import revised translations. DO NOT MERGE
Mathias Agopian [Tue, 29 Nov 2011 19:49:10 +0000 (11:49 -0800)]
am
aa2892ed: Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8
* commit '
aa2892edc7bb2b915771679d9811ec54a26db366':
Add support for sending VSYNC events to the framework
BitTube::read now handles EAGAIN
split ComposerService out of SurfaceComposerClient.h
rewrite SF's message loop on top of Looper
Eric Fischer [Tue, 29 Nov 2011 19:47:08 +0000 (11:47 -0800)]
am
9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
9ab3c62499c054b600699fb107c28fc8926ca5a1':
Import revised translations. DO NOT MERGE
Mathias Agopian [Tue, 29 Nov 2011 19:47:03 +0000 (11:47 -0800)]
Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8
* changes:
Add support for sending VSYNC events to the framework
BitTube::read now handles EAGAIN
split ComposerService out of SurfaceComposerClient.h
rewrite SF's message loop on top of Looper
Eric Fischer [Tue, 29 Nov 2011 19:44:59 +0000 (11:44 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Mathias Agopian [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]
Add support for sending VSYNC events to the framework
use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.
Bug:
1475048
Change-Id: If4126023fc9c067e56087ec7d16a8fd542ce1794
Mathias Agopian [Tue, 29 Nov 2011 19:42:32 +0000 (11:42 -0800)]
BitTube::read now handles EAGAIN
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
Mathias Agopian [Tue, 29 Nov 2011 19:41:45 +0000 (11:41 -0800)]
am
1e773932: am
db0bc7d4: am
3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit '
1e773932a1658128b80508f081de3c80655465d2':
temporarily hardcode Nexus S refresh rate
Mathias Agopian [Tue, 29 Nov 2011 19:39:49 +0000 (11:39 -0800)]
am
db0bc7d4: am
3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit '
db0bc7d46cacb6446deb7c59d39ce563846d7071':
temporarily hardcode Nexus S refresh rate
Mathias Agopian [Tue, 29 Nov 2011 19:36:54 +0000 (11:36 -0800)]
am
3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit '
3f2730c5317700e3ae5412b5c825a747b591ebc2':
temporarily hardcode Nexus S refresh rate
Mathias Agopian [Tue, 29 Nov 2011 19:35:07 +0000 (11:35 -0800)]
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 19:13:36 +0000 (11:13 -0800)]
am
9b426869: Merge "Import revised translations."
* commit '
9b4268697f0254d21ae56d2b2a8fe190e3a43e79':
Import revised translations.
Eric Fischer [Tue, 29 Nov 2011 19:09:51 +0000 (11:09 -0800)]
Merge "Import revised translations."
Dianne Hackborn [Tue, 29 Nov 2011 18:22:18 +0000 (10:22 -0800)]
am
45c62be2: am
e2d76314: am
9b518d93: Merge "Fix issue #
5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '
45c62be2bc553f603c9adadc60abff62ddedba79':
Fix issue #
5642121: Proximity sensor didn't turn the screen on in call
Dianne Hackborn [Tue, 29 Nov 2011 18:20:03 +0000 (10:20 -0800)]
am
e2d76314: am
9b518d93: Merge "Fix issue #
5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '
e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
Fix issue #
5642121: Proximity sensor didn't turn the screen on in call
Dianne Hackborn [Tue, 29 Nov 2011 18:17:42 +0000 (10:17 -0800)]
am
9b518d93: Merge "Fix issue #
5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '
9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #
5642121: Proximity sensor didn't turn the screen on in call
Dianne Hackborn [Tue, 29 Nov 2011 18:16:11 +0000 (10:16 -0800)]
Merge "Fix issue #
5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:13:17 +0000 (10:13 -0800)]
am
f96ccc17: am
f4e41c35: am
eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
* commit '
f96ccc175d1309749be5a8a6b748d316ab863086':
Cleanup references when turning BT off.
Jaikumar Ganesh [Tue, 29 Nov 2011 18:13:15 +0000 (10:13 -0800)]
am
9ab5ef27: am
910ae39f: am
ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
* commit '
9ab5ef2741e2eaeb44218d802643de81ddb4b7a1':
Cleanup static references when quitting.
Gilles Debunne [Tue, 29 Nov 2011 18:11:06 +0000 (10:11 -0800)]
am
c273cd31: Merge "Restoring mLayout has private in TextView"
* commit '
c273cd318d8bb45c22a914ba88d4cb4dd94a768e':
Restoring mLayout has private in TextView
Jaikumar Ganesh [Tue, 29 Nov 2011 18:09:40 +0000 (10:09 -0800)]
am
f4e41c35: am
eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
* commit '
f4e41c35387728720780935564a491cf9bf1357e':
Cleanup references when turning BT off.
Jaikumar Ganesh [Tue, 29 Nov 2011 18:09:38 +0000 (10:09 -0800)]
am
910ae39f: am
ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
* commit '
910ae39f8a12bcb917b7eb1da3f701925da79509':
Cleanup static references when quitting.
Gilles Debunne [Tue, 29 Nov 2011 18:09:25 +0000 (10:09 -0800)]
Merge "Restoring mLayout has private in TextView"
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:09 +0000 (10:07 -0800)]
am
eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
* commit '
eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:07 +0000 (10:07 -0800)]
am
ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
* commit '
ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.
Gilles Debunne [Tue, 29 Nov 2011 18:07:02 +0000 (10:07 -0800)]
am
e29e4d2a: am
9d8d5297: am
10232fe6: Merge "Extracted text problems" into ics-mr1
* commit '
e29e4d2adef21aa54b2ae4bf225e3492bc3735c3':
Extracted text problems
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:27 +0000 (10:05 -0800)]
Merge "Cleanup references when turning BT off." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:13 +0000 (10:05 -0800)]
Merge "Cleanup static references when quitting." into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 18:04:38 +0000 (10:04 -0800)]
am
6c9d4f3c: am
0dca407e: am
7be31bd9: Merge "IOOB in text selection." into ics-mr1
* commit '
6c9d4f3cd3c5185cda06f3bf83049dba81007bd1':
IOOB in text selection.
Gilles Debunne [Tue, 29 Nov 2011 18:04:01 +0000 (10:04 -0800)]
am
9d8d5297: am
10232fe6: Merge "Extracted text problems" into ics-mr1
* commit '
9d8d529739b1b9790599364f57cffbe022d15ee2':
Extracted text problems
Gilles Debunne [Tue, 29 Nov 2011 18:01:43 +0000 (10:01 -0800)]
am
0dca407e: am
7be31bd9: Merge "IOOB in text selection." into ics-mr1
* commit '
0dca407eede3d85a0185718f4993c2b09d1cc658':
IOOB in text selection.
Gilles Debunne [Tue, 29 Nov 2011 18:01:35 +0000 (10:01 -0800)]
am
10232fe6: Merge "Extracted text problems" into ics-mr1
* commit '
10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
Gilles Debunne [Tue, 29 Nov 2011 17:59:25 +0000 (09:59 -0800)]
am
7be31bd9: Merge "IOOB in text selection." into ics-mr1
* commit '
7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.
OSDN Git Service
