OSDN Git Service
Scott Main [Mon, 26 Mar 2012 21:54:11 +0000 (14:54 -0700)]
am
8f16f8bc: am
7fa4a28e: docs: add Coolpad to oem driver list
* commit '
8f16f8bc7299656c1e3200daa525610ae80a3f22':
Scott Main [Mon, 26 Mar 2012 21:48:20 +0000 (14:48 -0700)]
am
0824035b: am
af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '
0824035b56056abcb64e516ab27f669fc0689681':
docs: replace the "Contribute" message with "Design"
Scott Main [Mon, 26 Mar 2012 21:44:15 +0000 (14:44 -0700)]
am
af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '
af9a26b21262500c5f864bcd82bc14ee805fdaac':
docs: replace the "Contribute" message with "Design"
Scott Main [Mon, 26 Mar 2012 21:42:22 +0000 (14:42 -0700)]
Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
Scott Main [Mon, 26 Mar 2012 21:35:29 +0000 (14:35 -0700)]
am
123f828d: am
7fa4a28e: docs: add Coolpad to oem driver list
* commit '
123f828de0339221f8bd7e24fc4a3764de51c8bb':
docs: add Coolpad to oem driver list
Scott Main [Mon, 26 Mar 2012 21:30:01 +0000 (14:30 -0700)]
am
7fa4a28e: docs: add Coolpad to oem driver list
* commit '
7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
docs: add Coolpad to oem driver list
Scott Main [Mon, 26 Mar 2012 21:29:23 +0000 (14:29 -0700)]
am
7fa4a28e: docs: add Coolpad to oem driver list
* commit '
7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
docs: add Coolpad to oem driver list
Scott Main [Mon, 26 Mar 2012 21:25:01 +0000 (14:25 -0700)]
docs: replace the "Contribute" message with "Design"
Change-Id: I38c5990b3b5ee6538197c59671cec7adeadea913
Scott Main [Mon, 26 Mar 2012 19:12:24 +0000 (12:12 -0700)]
docs: add Coolpad to oem driver list
Change-Id: I0cb6267a35d9a691c6cacea471a9fca9d5dc61b8
Joe Malin [Sun, 25 Mar 2012 20:08:55 +0000 (13:08 -0700)]
am
5d181a39: am
093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '
5d181a390b63970c08175afa64babb3dd46b11de':
Joe Malin [Sun, 25 Mar 2012 20:07:06 +0000 (13:07 -0700)]
am
8ea93aa6: am
093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '
8ea93aa6adc0e46c8931d31d4f940cdde97c672f':
DOC CHANGE: IME subtype article
Joe Malin [Sun, 25 Mar 2012 20:04:59 +0000 (13:04 -0700)]
am
093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '
093ed3838c3f2847be1893ea49c6b15b90e0afc3':
DOC CHANGE: IME subtype article
Joe Malin [Sun, 25 Mar 2012 20:04:58 +0000 (13:04 -0700)]
am
093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '
093ed3838c3f2847be1893ea49c6b15b90e0afc3':
DOC CHANGE: IME subtype article
Joe Malin [Sun, 25 Mar 2012 20:02:53 +0000 (13:02 -0700)]
Merge "DOC CHANGE: IME subtype article" into ics-mr1
Reto Meier [Fri, 23 Mar 2012 20:34:25 +0000 (13:34 -0700)]
am
106d8460: am
20f394df: Docs: Added efficient downloads Android U class
* commit '
106d846080d6d239ab0eb3539cd92516046dcd4d':
Reto Meier [Fri, 23 Mar 2012 20:33:02 +0000 (13:33 -0700)]
am
278296b5: am
20f394df: Docs: Added efficient downloads Android U class
* commit '
278296b59fb16b5dcb7cc8e5a7538518a2a3dbb7':
Docs: Added efficient downloads Android U class
Reto Meier [Fri, 23 Mar 2012 20:30:13 +0000 (13:30 -0700)]
am
20f394df: Docs: Added efficient downloads Android U class
* commit '
20f394df4db02c492d7920f4f366b777451c2067':
Docs: Added efficient downloads Android U class
Reto Meier [Fri, 23 Mar 2012 20:30:04 +0000 (13:30 -0700)]
am
20f394df: Docs: Added efficient downloads Android U class
* commit '
20f394df4db02c492d7920f4f366b777451c2067':
Docs: Added efficient downloads Android U class
Reto Meier [Wed, 14 Mar 2012 16:27:11 +0000 (09:27 -0700)]
Docs: Added efficient downloads Android U class
Change-Id: I2a9484c5a224a7e0688fbd9afb16246db8f3ddf9
Joe Malin [Sat, 10 Mar 2012 00:04:35 +0000 (16:04 -0800)]
DOC CHANGE: IME subtype article
Change-Id: Ie7addcc6155c275b247e15787fe226b43b0dee1a
Andrew Hsieh [Thu, 22 Mar 2012 17:22:24 +0000 (10:22 -0700)]
am
1c4c320d: am
3347d659: am
1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '
1c4c320da7832129621e9e44d3f8d8902cb58462':
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
Andrew Hsieh [Thu, 22 Mar 2012 17:18:59 +0000 (10:18 -0700)]
am
3347d659: am
1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '
3347d6597bd6214f037825e41be7e58198d9079d':
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
Andrew Hsieh [Thu, 22 Mar 2012 17:16:42 +0000 (10:16 -0700)]
am
1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '
1f9e749914c7c636bd759da0209e68d5801407ac':
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
Andrew Hsieh [Tue, 13 Mar 2012 07:55:34 +0000 (00:55 -0700)]
Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so
Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
Joe Fernandez [Wed, 21 Mar 2012 23:47:34 +0000 (16:47 -0700)]
am
f20ebda6: am
66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '
f20ebda6efb711d1cda132ae89439e7aed5944f1':
Joe Fernandez [Wed, 21 Mar 2012 23:46:38 +0000 (16:46 -0700)]
am
9eea8881: am
66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '
9eea888105b3d8d69a28e2dea840808d394f07b9':
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Joe Fernandez [Wed, 21 Mar 2012 23:43:33 +0000 (16:43 -0700)]
am
66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '
66f1bafb2326e12814df703a4285373e8651a3ce':
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Joe Fernandez [Wed, 21 Mar 2012 23:43:29 +0000 (16:43 -0700)]
am
66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '
66f1bafb2326e12814df703a4285373e8651a3ce':
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Joe Fernandez [Wed, 21 Mar 2012 23:41:19 +0000 (16:41 -0700)]
Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
Joe Fernandez [Wed, 21 Mar 2012 23:25:21 +0000 (16:25 -0700)]
docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
The Android Open Source Project [Wed, 21 Mar 2012 16:06:34 +0000 (09:06 -0700)]
am
98e1b541: Reconcile with ics-mr1-release
* commit '
98e1b541f271e92b9dc25d54e275c28102746b04':
The Android Open Source Project [Wed, 21 Mar 2012 16:00:43 +0000 (09:00 -0700)]
Reconcile with ics-mr1-release
Change-Id: Id19190393a665dd1b07c073970925758aa383691
The Android Open Source Project [Wed, 21 Mar 2012 15:26:56 +0000 (08:26 -0700)]
am
35a8f94d: Reconcile with ics-mr1-release
* commit '
35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
Fix
5960562: Show emergency button on PukUnlock screen
The Android Open Source Project [Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)]
Reconcile with ics-mr1-release
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
Jim Miller [Tue, 20 Mar 2012 22:30:43 +0000 (15:30 -0700)]
Fix
5960562: Show emergency button on PukUnlock screen
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.
Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
Jim Miller [Tue, 20 Mar 2012 23:46:06 +0000 (16:46 -0700)]
am
890266fa: am
928d3470: Fix
5960562: Show emergency button on PukUnlock screen
* commit '
890266fa5702292517774ca2aa56a410df535b28':
Jim Miller [Tue, 20 Mar 2012 23:44:43 +0000 (16:44 -0700)]
am
b7a6f5d7: am
928d3470: Fix
5960562: Show emergency button on PukUnlock screen
* commit '
b7a6f5d7e87eb4fba6d6868e73a9c06d73789517':
Fix
5960562: Show emergency button on PukUnlock screen
Jim Miller [Tue, 20 Mar 2012 23:42:20 +0000 (16:42 -0700)]
am
928d3470: Fix
5960562: Show emergency button on PukUnlock screen
* commit '
928d34704b96db9133e28dc77b716518d335b356':
Fix
5960562: Show emergency button on PukUnlock screen
Jim Miller [Tue, 20 Mar 2012 23:41:56 +0000 (16:41 -0700)]
am
928d3470: Fix
5960562: Show emergency button on PukUnlock screen
* commit '
928d34704b96db9133e28dc77b716518d335b356':
Fix
5960562: Show emergency button on PukUnlock screen
Jim Miller [Tue, 20 Mar 2012 22:30:43 +0000 (15:30 -0700)]
Fix
5960562: Show emergency button on PukUnlock screen
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.
Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
Eric Laurent [Mon, 19 Mar 2012 15:38:45 +0000 (08:38 -0700)]
am
cbc90453: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
cbc90453248bd3f9a11fdbc07e544d4a39592934':
Eric Laurent [Mon, 19 Mar 2012 15:37:48 +0000 (08:37 -0700)]
am
165ee4c5: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
165ee4c53da462b1b6d131e25456dade51c18496':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:34:56 +0000 (08:34 -0700)]
am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:34:44 +0000 (08:34 -0700)]
am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:32:35 +0000 (08:32 -0700)]
Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
Joe Fernandez [Mon, 19 Mar 2012 15:32:32 +0000 (08:32 -0700)]
am
f9737a89: am
dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit '
f9737a890bbaff30268c8137e6375cfa249c3f1a':
Joe Fernandez [Mon, 19 Mar 2012 15:31:14 +0000 (08:31 -0700)]
am
9018447a: am
dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit '
9018447a10b7cfe518b4138186acd69d8fd7f31e':
docs: Android SDK r17 (RC6) Release Notes
Joe Fernandez [Mon, 19 Mar 2012 15:28:13 +0000 (08:28 -0700)]
am
dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit '
dbab18f64a1b17311a0c865ed43200e9dc239113':
docs: Android SDK r17 (RC6) Release Notes
Joe Fernandez [Mon, 19 Mar 2012 15:27:59 +0000 (08:27 -0700)]
am
dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit '
dbab18f64a1b17311a0c865ed43200e9dc239113':
docs: Android SDK r17 (RC6) Release Notes
Joe Fernandez [Mon, 19 Mar 2012 15:25:48 +0000 (08:25 -0700)]
Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
Justin Ho [Mon, 19 Mar 2012 15:15:35 +0000 (08:15 -0700)]
am
47ec443a: am
972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '
47ec443ae0cab1de6f1e2504974cc42e019ce556':
Justin Ho [Mon, 19 Mar 2012 15:14:21 +0000 (08:14 -0700)]
am
46a41ced: am
972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '
46a41ced325f0519e37374179623ff3079b6aed9':
DO NOT MERGE Revert "Increase line limit for summary text"
Justin Ho [Mon, 19 Mar 2012 15:11:16 +0000 (08:11 -0700)]
am
972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '
972d12aa1e6fba69094c0a9270df645b7db74f3a':
DO NOT MERGE Revert "Increase line limit for summary text"
Justin Ho [Mon, 19 Mar 2012 15:11:15 +0000 (08:11 -0700)]
am
972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '
972d12aa1e6fba69094c0a9270df645b7db74f3a':
DO NOT MERGE Revert "Increase line limit for summary text"
Justin Ho [Mon, 19 Mar 2012 15:08:56 +0000 (08:08 -0700)]
Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
Justin Ho [Sun, 18 Mar 2012 00:09:35 +0000 (17:09 -0700)]
DO NOT MERGE Revert "Increase line limit for summary text"
This reverts commit
90e3bcae6771df767c3377ca3bd6c08d99062ca3
Eric Laurent [Sat, 17 Mar 2012 03:37:59 +0000 (20:37 -0700)]
audioflinger: fix issue with camcorder and A2DP
Some audio HALs do not support well a device selection of 0 (no device)
received on an input stream.
This can happen because of a problem in the audioflinger code that handles
the forwarding of the output device selection to the record thread for use by
the pre processing modules that need it. If the output device is 0 (meaning
no op, which happens when stopping playback over A2DP) audioflinger could not
detect it was an output device selection and would forward it to the input
stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l().
Issue
6179641.
Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
The Android Automerger [Sat, 17 Mar 2012 02:32:33 +0000 (19:32 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Joe Fernandez [Fri, 16 Mar 2012 08:17:58 +0000 (01:17 -0700)]
docs: Android SDK r17 (RC6) Release Notes
Change-Id: I1e58b3827e4fe70310d2154e0f85b16b79d6a0d2
Eric Laurent [Sat, 17 Mar 2012 00:29:43 +0000 (17:29 -0700)]
am
eaa08d35: am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
Eric Laurent [Sat, 17 Mar 2012 00:27:09 +0000 (17:27 -0700)]
am
b1853f70: am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
b1853f706371b5050cd8184f5c33955c2f5ae36a':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Sat, 17 Mar 2012 00:26:24 +0000 (17:26 -0700)]
am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)]
am
b388138f: resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
* commit '
b388138ff2986d6883fa9331fa91ae5e18ae81a0':
Eric Laurent [Sat, 17 Mar 2012 00:22:34 +0000 (17:22 -0700)]
resolved conflicts for merge of
393dd03e to ics-scoop-plus-aosp
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
Eric Laurent [Sat, 17 Mar 2012 00:19:25 +0000 (17:19 -0700)]
resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
Eric Laurent [Fri, 16 Mar 2012 22:01:03 +0000 (15:01 -0700)]
am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Fri, 16 Mar 2012 22:01:01 +0000 (15:01 -0700)]
am
3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
* commit '
3fe7ee651db0aae9485ead227c89db1e24b9e245':
AudioTrack: relax check on minimum buffer size
Eric Laurent [Fri, 16 Mar 2012 21:58:21 +0000 (14:58 -0700)]
Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
Eric Laurent [Fri, 16 Mar 2012 21:58:07 +0000 (14:58 -0700)]
Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
Amith Yamasani [Fri, 16 Mar 2012 21:17:09 +0000 (14:17 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Amith Yamasani [Fri, 16 Mar 2012 21:17:05 +0000 (14:17 -0700)]
am
31f7ef24: am
90e3bcae: Increase line limit for summary text
* commit '
31f7ef2436ca7cbe754f33d536593f9640a31fb0':
Increase line limit for summary text
Amith Yamasani [Fri, 16 Mar 2012 21:16:27 +0000 (14:16 -0700)]
am
5fd6deb0: am
90e3bcae: Increase line limit for summary text
* commit '
5fd6deb0497d6763514f125b5fde69ee4efdc3c2':
Increase line limit for summary text
Amith Yamasani [Fri, 16 Mar 2012 21:13:48 +0000 (14:13 -0700)]
am
90e3bcae: Increase line limit for summary text
* commit '
90e3bcae6771df767c3377ca3bd6c08d99062ca3':
Increase line limit for summary text
Amith Yamasani [Fri, 16 Mar 2012 21:13:45 +0000 (14:13 -0700)]
am
90e3bcae: Increase line limit for summary text
* commit '
90e3bcae6771df767c3377ca3bd6c08d99062ca3':
Increase line limit for summary text
Amith Yamasani [Fri, 16 Mar 2012 20:13:50 +0000 (13:13 -0700)]
Increase line limit for summary text
Doing this to accomodate some really long warning text in a
checkbox widget. Needs 5 lines for English. Probably a lot
more for German, etc., so increasing it to 10 lines.
Please don't abuse that. 4 lines is still a reasonable max.
Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
Eric Laurent [Tue, 6 Mar 2012 01:27:11 +0000 (17:27 -0800)]
MediaPlayerService: fix AudioSink latency
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.
This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.
Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
Conflicts:
media/libmediaplayerservice/MediaPlayerService.cpp
Eric Laurent [Tue, 6 Mar 2012 01:06:40 +0000 (17:06 -0800)]
AudioTrack: relax check on minimum buffer size
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.
Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.
Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
Conflicts:
media/libmedia/AudioTrack.cpp
Katie McCormick [Fri, 16 Mar 2012 19:15:26 +0000 (12:15 -0700)]
am
2f8b35dd: am
2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
* commit '
2f8b35dd88501d9174565f7f377933b0e516032c':
Katie McCormick [Fri, 16 Mar 2012 19:13:03 +0000 (12:13 -0700)]
am
45660f46: am
2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
* commit '
45660f46d3877cc146ae52b9c152dc606d622485':
Doc update: DDMS Network Traffic tool.
Katie McCormick [Fri, 16 Mar 2012 19:11:30 +0000 (12:11 -0700)]
am
2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
* commit '
2b056c6e6759d63045c22556c5418a08fcb3f80c':
Doc update: DDMS Network Traffic tool.
Katie McCormick [Fri, 16 Mar 2012 19:11:16 +0000 (12:11 -0700)]
am
2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
* commit '
2b056c6e6759d63045c22556c5418a08fcb3f80c':
Doc update: DDMS Network Traffic tool.
Katie McCormick [Fri, 16 Mar 2012 19:09:59 +0000 (12:09 -0700)]
Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
Dianne Hackborn [Fri, 16 Mar 2012 18:58:23 +0000 (11:58 -0700)]
am
df3228e5: am
ce06c000: Merge "Debugging code for #
6169553: Make Phone launch faster" into ics-mr1
* commit '
df3228e561636832436d45911befa0798ad50594':
Dianne Hackborn [Fri, 16 Mar 2012 18:57:45 +0000 (11:57 -0700)]
am
c032a73b: am
ce06c000: Merge "Debugging code for #
6169553: Make Phone launch faster" into ics-mr1
* commit '
c032a73b511d4006e083a646b7dd23d54ed373ac':
Debugging code for #
6169553: Make Phone launch faster
Katie McCormick [Mon, 5 Mar 2012 22:02:00 +0000 (14:02 -0800)]
Doc update: DDMS Network Traffic tool.
Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
Dianne Hackborn [Fri, 16 Mar 2012 18:55:05 +0000 (11:55 -0700)]
am
ce06c000: Merge "Debugging code for #
6169553: Make Phone launch faster" into ics-mr1
* commit '
ce06c000b4133c63414c3244c3325e25315ab179':
Debugging code for #
6169553: Make Phone launch faster
Dianne Hackborn [Fri, 16 Mar 2012 18:55:00 +0000 (11:55 -0700)]
am
ce06c000: Merge "Debugging code for #
6169553: Make Phone launch faster" into ics-mr1
* commit '
ce06c000b4133c63414c3244c3325e25315ab179':
Debugging code for #
6169553: Make Phone launch faster
Dianne Hackborn [Fri, 16 Mar 2012 18:53:53 +0000 (11:53 -0700)]
Merge "Debugging code for #
6169553: Make Phone launch faster" into ics-mr1
Joe Fernandez [Fri, 16 Mar 2012 17:48:33 +0000 (10:48 -0700)]
am
6b163632: am
1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17
* commit '
6b16363232e107047f430614b4a81e61b7f391c1':
Joe Fernandez [Fri, 16 Mar 2012 17:47:38 +0000 (10:47 -0700)]
am
c8e83aa7: am
1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17
* commit '
c8e83aa73e174be163649bb80989b9099fbb74cf':
docs: Emulator Hardware Acceleration docs for SDK r17
Joe Fernandez [Fri, 16 Mar 2012 17:44:54 +0000 (10:44 -0700)]
am
1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17
* commit '
1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
docs: Emulator Hardware Acceleration docs for SDK r17
Joe Fernandez [Fri, 16 Mar 2012 17:44:50 +0000 (10:44 -0700)]
am
1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17
* commit '
1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
docs: Emulator Hardware Acceleration docs for SDK r17
Joe Fernandez [Fri, 16 Mar 2012 07:53:41 +0000 (00:53 -0700)]
docs: Emulator Hardware Acceleration docs for SDK r17
Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
Glenn Kasten [Fri, 16 Mar 2012 17:03:54 +0000 (10:03 -0700)]
am
aa1bd6de: am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 17:01:28 +0000 (10:01 -0700)]
am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
d8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 05:09:38 +0000 (22:09 -0700)]
am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
Add empty libmedia_native in old location
Glenn Kasten [Thu, 15 Mar 2012 23:02:45 +0000 (16:02 -0700)]
Merge "Add empty libmedia_native in old location"
Scott Main [Thu, 15 Mar 2012 23:00:40 +0000 (16:00 -0700)]
am
886603da: am
eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
* commit '
886603da73526eb992dfb4bc5afc89c7a17294d8':
Scott Main [Thu, 15 Mar 2012 22:59:37 +0000 (15:59 -0700)]
am
714d655c: am
eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
* commit '
714d655ccfcc0d465a1a8c190d407e3d97261d76':
docs: Fix a bunch of misc doc issues from external tracker
Scott Main [Thu, 15 Mar 2012 22:56:12 +0000 (15:56 -0700)]
am
eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
* commit '
eb1d42e4faa34c2acf76200913920fd5ca46a39e':
docs: Fix a bunch of misc doc issues from external tracker
OSDN Git Service
