OSDN Git Service
Joe Fernandez [Tue, 3 Apr 2012 00:24:20 +0000 (17:24 -0700)]
am
2c015353: Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1
* commit '
2c0153539a01d63bcc04e73ab46237bec9a7868b':
docs: SDK r18 + 4.0.4 system image Release Notes (RC1)
Joe Fernandez [Tue, 3 Apr 2012 00:21:01 +0000 (17:21 -0700)]
am
1cbd69fb: Merge "docs: Fix for jarsigner and JDK7; specify signature and digest algorithim" into ics-mr1
* commit '
1cbd69fbab476bc65f38fd7e871a02299ced669a':
docs: Fix for jarsigner and JDK7; specify signature and digest algorithim
Joe Fernandez [Tue, 3 Apr 2012 00:19:06 +0000 (17:19 -0700)]
Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1
Joe Fernandez [Tue, 3 Apr 2012 00:17:45 +0000 (17:17 -0700)]
Merge "docs: Fix for jarsigner and JDK7; specify signature and digest algorithim" into ics-mr1
Joe Fernandez [Mon, 26 Mar 2012 18:50:13 +0000 (11:50 -0700)]
docs: SDK r18 + 4.0.4 system image Release Notes (RC1)
Change-Id: Iee4a96acf1b86e02e1836801e63b01a357416777
Joe Fernandez [Thu, 29 Mar 2012 18:36:23 +0000 (11:36 -0700)]
docs: Fix for jarsigner and JDK7; specify signature and digest algorithim
Change-Id: Ia44bb209a9a3ace83dfe10ca4669c15ddd7f4caf
Scott Main [Mon, 2 Apr 2012 18:42:04 +0000 (11:42 -0700)]
am
dfa3b8fa: docs: dashboard update for 4/2
* commit '
dfa3b8fa4a3cb48877be364749a37acc9f08721b':
docs: dashboard update for 4/2
Scott Main [Mon, 2 Apr 2012 18:14:23 +0000 (11:14 -0700)]
docs: dashboard update for 4/2
Change-Id: Id5fd6c7eaa80bba1ebea58fb7df762ea2635130d
Scott Main [Mon, 2 Apr 2012 16:23:40 +0000 (09:23 -0700)]
am
6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1
* commit '
6a273f0d045951552263b1b66c34d29929c5a282':
docs: de-new a bunch of docs
Scott Main [Mon, 2 Apr 2012 16:21:45 +0000 (09:21 -0700)]
Merge "docs: de-new a bunch of docs" into ics-mr1
Tony Chan [Sat, 31 Mar 2012 09:15:49 +0000 (02:15 -0700)]
am
4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1
* commit '
4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
sdk doc change: Added KeyChain API Demo
Tony Chan [Sat, 31 Mar 2012 09:13:45 +0000 (02:13 -0700)]
Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1
Scott Main [Fri, 30 Mar 2012 17:29:33 +0000 (10:29 -0700)]
docs: de-new a bunch of docs
Change-Id: I5ff761b6fe4958f8ef67fb2fa7af81c3e81cbda6
Tony Chan [Wed, 28 Mar 2012 17:33:08 +0000 (01:33 +0800)]
sdk doc change: Added KeyChain API Demo
Change-Id: I8ea879bf30f933c745e33dafa6591fce77251eb6
Joe Malin [Thu, 29 Mar 2012 20:29:32 +0000 (13:29 -0700)]
am
6a04325d: DOC CHANGE: Spell Checker article
* commit '
6a04325d5d54e1e51b47c86b7386c355e4eb2191':
DOC CHANGE: Spell Checker article
Joe Malin [Thu, 15 Mar 2012 01:24:43 +0000 (18:24 -0700)]
DOC CHANGE: Spell Checker article
Change-Id: I839fc46cc58d68537bbdc0e3433c6329cdab2b04
Scott Main [Mon, 26 Mar 2012 23:45:15 +0000 (16:45 -0700)]
am
bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
* commit '
bd26ba4871078aa85024320040de35995e90924b':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
Scott Main [Mon, 26 Mar 2012 23:43:03 +0000 (16:43 -0700)]
Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
Scott Main [Thu, 15 Mar 2012 00:16:11 +0000 (17:16 -0700)]
docs: update SDK and AVD Manager strings; update android tool doc
and update another AVD manager screenshot
and finally change "component" to "package" for SDK manager docs
Change-Id: Iae7de7c0264d0cdff4fba0920e50e4637bcf90e0
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: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: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: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 [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
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:00:43 +0000 (09:00 -0700)]
Reconcile with ics-mr1-release
Change-Id: Id19190393a665dd1b07c073970925758aa383691
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: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 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: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: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: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 [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: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 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: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:09:59 +0000 (12:09 -0700)]
Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
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: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: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
Scott Main [Thu, 15 Mar 2012 22:56:05 +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
Scott Main [Thu, 15 Mar 2012 22:52:56 +0000 (15:52 -0700)]
Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
Dianne Hackborn [Thu, 15 Mar 2012 22:48:38 +0000 (15:48 -0700)]
Debugging code for #
6169553: Make Phone launch faster
The activity manager now has a tick when launching an app every
500ms, where it collects the current stack traces of the app if
it hasn't finished launching. These traces are included as part
of dumpstate.
This is only done on non-user builds.
Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
Dianne Hackborn [Thu, 15 Mar 2012 18:29:22 +0000 (11:29 -0700)]
am
33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '
33ace979a452301796694ffd64506f082de42f0d':
Remove fade animations from framework drawables.
Dianne Hackborn [Thu, 15 Mar 2012 18:27:43 +0000 (11:27 -0700)]
Merge "Remove fade animations from framework drawables." into ics-mr1
Scott Main [Thu, 15 Mar 2012 17:22:35 +0000 (10:22 -0700)]
am
f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '
f32ab914147ede0b02302a28cce6fd2f301b0b3e':
docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
Scott Main [Thu, 15 Mar 2012 17:21:00 +0000 (10:21 -0700)]
Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1
Robert Ly [Wed, 14 Mar 2012 23:54:59 +0000 (16:54 -0700)]
am
957f716c: docs: fix toc in search au class
* commit '
957f716cf1686145ba4c06ca8669eaa2e22f54e8':
docs: fix toc in search au class
Dianne Hackborn [Wed, 14 Mar 2012 23:46:59 +0000 (16:46 -0700)]
Remove fade animations from framework drawables.
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
Robert Ly [Wed, 14 Mar 2012 23:24:25 +0000 (16:24 -0700)]
docs: fix toc in search au class
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
Scott Main [Wed, 14 Mar 2012 22:44:56 +0000 (15:44 -0700)]
docs: update various SDK and AVD Manager screenshots
and remove one from the licensing doc that's not necessary
Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
Robert Ly [Wed, 14 Mar 2012 22:46:17 +0000 (15:46 -0700)]
am
b285125d: Merge "docs: android u search class" into ics-mr1
* commit '
b285125d4bad1c76e95cd24956711deb9908c4a8':
docs: android u search class
Robert Ly [Wed, 14 Mar 2012 22:41:02 +0000 (15:41 -0700)]
Merge "docs: android u search class" into ics-mr1
Scott Main [Wed, 14 Mar 2012 06:12:09 +0000 (23:12 -0700)]
am
7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '
7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
docs: remove link from GP logo
Scott Main [Wed, 14 Mar 2012 06:09:09 +0000 (23:09 -0700)]
Merge "docs: remove link from GP logo" into ics-mr1
Junichi Monma [Wed, 14 Mar 2012 05:48:38 +0000 (22:48 -0700)]
Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop
Robert Ly [Fri, 3 Feb 2012 19:00:47 +0000 (11:00 -0800)]
docs: android u search class
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
The Android Automerger [Tue, 13 Mar 2012 02:33:04 +0000 (19:33 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Lehmann [Tue, 13 Mar 2012 01:24:41 +0000 (18:24 -0700)]
am
0e873700: Remove the country detector logging
* commit '
0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
Daniel Lehmann [Tue, 13 Mar 2012 00:04:17 +0000 (17:04 -0700)]
Remove the country detector logging
Bug:
6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
Andrew Flynn [Mon, 12 Mar 2012 23:00:44 +0000 (16:00 -0700)]
Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
Andrew Flynn [Mon, 12 Mar 2012 23:00:36 +0000 (16:00 -0700)]
Merge "DO NOT MERGE" into ics-scoop
Wink Saville [Mon, 12 Mar 2012 22:53:52 +0000 (15:53 -0700)]
am
f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '
f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Michael Jurka [Sat, 10 Mar 2012 01:41:41 +0000 (17:41 -0800)]
DO NOT MERGE Fix back button state issue
Back button / down chevron button (eg when you have an IME visible)
was not getting synced on rotation changes
Bug:
6133831
Change-Id: Iefaf3babf92898fcc87a0b14c10b037de04d84e2
Daniel Sandler [Fri, 23 Sep 2011 19:56:52 +0000 (15:56 -0400)]
DO NOT MERGE
System bar now renders the back button for recents
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.
As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.
Bug:
3448536
Change-Id: Ie64369e3df3178178f35b56763ea96d380b6ddd4
Wink Saville [Sat, 10 Mar 2012 21:23:35 +0000 (13:23 -0800)]
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.
Bug:
6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
The Android Automerger [Sat, 10 Mar 2012 17:07:24 +0000 (09:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:23:56 +0000 (19:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Sat, 10 Mar 2012 03:12:53 +0000 (19:12 -0800)]
docs: remove link from GP logo
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
Scott Main [Fri, 9 Mar 2012 18:55:50 +0000 (10:55 -0800)]
docs: Fix a bunch of misc doc issues from external tracker
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
Andrew Flynn [Fri, 9 Mar 2012 19:00:14 +0000 (11:00 -0800)]
Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop
The Android Automerger [Fri, 9 Mar 2012 04:45:10 +0000 (20:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andrew Flynn [Wed, 7 Mar 2012 23:48:51 +0000 (15:48 -0800)]
Use a different width for nav icons in sw600dp-port.
Change-Id: I6c4024e9f60e14c072d7c01f29fabc89fc51dfb8
Megha Joshi [Thu, 8 Mar 2012 20:24:29 +0000 (12:24 -0800)]
am
33372b21: Merge "A few updates for TVs." into ics-mr1
* commit '
33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
Megha Joshi [Thu, 8 Mar 2012 20:22:49 +0000 (12:22 -0800)]
Merge "A few updates for TVs." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 20:22:05 +0000 (12:22 -0800)]
am
84099f3d: Merge "Adding TV related updates." into ics-mr1
* commit '
84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
Megha Joshi [Thu, 8 Mar 2012 20:20:21 +0000 (12:20 -0800)]
Merge "Adding TV related updates." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 00:09:05 +0000 (16:09 -0800)]
A few updates for TVs.
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
Megha Joshi [Thu, 8 Mar 2012 01:11:12 +0000 (17:11 -0800)]
Adding TV related updates.
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77