summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tuna: update prebuilt kernelIliyan Malchev2011-10-171-0/+0
| | | | | | | | | | | | | | | | | | | f9a1024 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7195c08 Merge branch 'linux-omap-3.0' into android-omap-3.0 7d5542c remoteproc: create new event to notify when secure mode is enable or disable 3d63a6b OMAP: DSS/DSSCOMP: Remove race conditions on callback setting and error handling 1aff097 OMAP4: HDMI: Read up-to 4 EDID blocks 828f971 OMAP4: HDMI: Reprogram video wrapper after wrapper reset 5d3e8a23 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 89588d7 Revert "OMAP4: SMC: add secure_dispatcher call early on resume" 93334df Merge branch 'linux-omap-3.0' into android-omap-3.0 92f0b30 OMAP4: PM: update ROM return address for OSWR and OFF 9d520bd OMAP4: PM: restore iva/l3inst for GP devices as well d4f9513 OMAP4: SMC: Replace HAL service values with macros to improve readability 2fd0f60 mfd: twl: Add debug info to twl_i2c_read/write errors Change-Id: Idfa3868a0e78bb08732b1bfbaacca1b00f17ad4c Signed-off-by: Iliyan Malchev <malchev@google.com>
* Merge "audio: enable DL2 mono mixer for speaker" into ics-mr0Simon Wilson2011-10-171-0/+7
|\
| * audio: enable DL2 mono mixer for speakerSimon Wilson2011-10-171-0/+7
| | | | | | | | | | | | | | | | Since the speaker is only connected to the DL2 left channel, downmix all DL2 audio from stereo to mono to avoid losing information. Change-Id: I8f536d3373b5517682722422df648d9d8050b840
* | tuna: update prebuilt kernelIliyan Malchev2011-10-171-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | 420a952 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5380815 Merge branch 'linux-omap-3.0' into android-omap-3.0 fd15d12 Merge branch 'android-3.0' into android-omap-3.0 02c3602 rpmsg: suppress rpmsg name service hex dumps 8ab7cdc remoteproc: add mutex protection for secure requests 63d5ea7 remoteproc: add protection for crash function 059a0ec omap: rpmsg: adapt to the rproc_event_register changes 75dddb1 remoteproc: combine all the block notify head structures into one 1057e5c omap: rpmsg: serialize reset of devices per rproc instead of channel 802152b tty: serial: omap: don't lock console in suspend. 370886c OMAP: DSS: panel-s6e8aa0: Remove delays from s6e8aa0_write_block 909bac2 ARM: omap4: tuna: Add 5ms delay after Sleep-Out command 2bff37c OMAP2+: DMA: Workaround for invalid source position a2d3bcf ASoC: OMAP ABE: Secure aess_pointer function for potential delay of start 5ae615d omap: mailbox: call request_irq after mbox queues are allocated 2cc01eb cpufreq: interactive governor: default timer 10ms, maxspeed load 95% Change-Id: Ie1291293a3e8a9e7824f3a76b83156955e5e59c2 Signed-off-by: Iliyan Malchev <malchev@google.com>
* tuna: update kernel prebuiltColin Cross2011-10-161-0/+0
| | | | | | | | | | | | | 3be2ce08 ARM: OMAP: Increase DMA consistent memory size to 14MB def96ed HACK: usbhost: ehci: print all ehci registers 19833df usb: ehci-omap: remove jiffies dependency on upli functions 0e78854 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 10cfb27 Merge branch 'android-3.0' into android-omap-3.0 83fbcd3 ARM: OMAP4: tuna: enable OFF mode by default during suspend 0ba392a net: wireless: bcmdhd: Add proper cleaning for ap_info structure b11ecb4 net: wireless: bcmdhd: Send cfg80211_disconnected() if fails to get rssi Change-Id: Ic1f193bd7659b3d5eef3fcf87045ff102f2c9bc6
* Merge "We can now strip all of the unneeded bitmaps, to allow preloading." ↵Dianne Hackborn2011-10-161-0/+5
|\ | | | | | | into ics-mr0
| * We can now strip all of the unneeded bitmaps, to allow preloading.Dianne Hackborn2011-10-161-0/+5
| | | | | | | | Change-Id: Ie01334727ac645a344a6ec112644661faed1fb80
* | Update touch firmware to version 0x56/0x36.Dima Zavin2011-10-162-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog from Melfas: - During initialization after changing mode (recovery from ESD state, or sleep/wake-up, etc.) there was also hardware initialization process also. Which could have caused an i2c failure if i2c was on process. - Also modified tuning value for touches on bottom of screen to be more sensitive Change-Id: I7b3424f21b85bffb20d4e5a2dd88026c6654919b Signed-off-by: Dima Zavin <dima@android.com>
* | tuna: update kernel prebuiltColin Cross2011-10-151-0/+0
|/ | | | | | | | | | | | | | 0b14aad ARM: omap4: tuna: emif: increase memory self refresh idle time f8da5d4 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 79cfeae Merge branch 'linux-omap-3.0' into android-omap-3.0 a50dfd1 OMAP4+: EMIF: fix ddr self refresh cycles computation 7aa0aa5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1483e9a Merge branch 'linux-omap-3.0' into android-omap-3.0 88018d8 omap: rpmsg: unmap vring buffers after release mailbox be0f4af OMAP4: temp_sensor: remove save_ctx use-counting f4fd303 GPIO: OMAP: Remove IS_ERR_VALUE calls Change-Id: I1d8687137f02ba801b3dacf71acde14ab7b7493a
* tuna: update prebuilt kernelIliyan Malchev2011-10-151-0/+0
| | | | | | | | | | | | | | Fixes b/5465636 7aa0aa5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1483e9a Merge branch 'linux-omap-3.0' into android-omap-3.0 88018d8 omap: rpmsg: unmap vring buffers after release mailbox be0f4af OMAP4: temp_sensor: remove save_ctx use-counting 2e33131 misc: modem_if: modemctl: Send CRASH event to RIL only ONLINE state f4fd303 GPIO: OMAP: Remove IS_ERR_VALUE calls Change-Id: If46439e5f4557603f187b6fd31f3c183728f6e4e Signed-off-by: Iliyan Malchev <malchev@google.com>
* tuna: update kernel prebuiltColin Cross2011-10-141-0/+0
| | | | | | 2e33131 misc: modem_if: modemctl: Send CRASH event to RIL only ONLINE state Change-Id: I62b0401dcf95bf45d470f47a51e7d9588e02bfdf
* tuna: update kernel prebuiltColin Cross2011-10-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8896a2c ARM: omap4: tuna: emif: provide self-refresh timing 5b7ba22 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 493a40e Merge branch 'linux-omap-3.0' into android-omap-3.0 ef2fee9 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 33f6599 misc: inv_mpu: yas530: Report the error flag for overflow or underflow 9dcf938 Merge branch 'linux-omap-3.0' into android-omap-3.0 4506788 OMAP4+: EMIF: Enable EMIF Self-Refresh mode e0f2fad modem_if: usb_link: fix tx resume path fe7aedf ARM: tuna: modem_if: set LTE_ACTIVE to pulldown mode b99d1eb modem_if: usb_link: purge sk_fmt_tx_q at the start of LTE flashless boot c5970d2 modem_if: usb_link: disallow AP2LTE tx and gpio handshaking if usb is not ready d76ac02 omap: rproc: user: add multiple user support for rproc user driver 7dda065 OMAP4: Enable/Disable GPIO clocks before/after Regiter access. 4492529 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 150be57 Merge branch 'linux-omap-3.0' into android-omap-3.0 fa20065 modem_if: usb_link: fix race of suspend and rx-submit d4253a8 ASoC: omap-pcm: Fix the no period wakeup implementation 8a1161b omap_remotproc: implement method dump_registers 9acedeb OMAP: tuna: sensors: Added a correction matrix for soft iron effect 59fa6f6 misc: inv_mpu: yas530: Added static soft iron correction feature 696a56e remoteproc: introduce rproc method dump_registers cdbe123 [ARM] omap: try not to allocate memory page by page 9d91575 HACK: usbhost: ehci: add more logging for ehci Change-Id: Id06e35b3d250e91e64d58b6fc06cda483e4d6d23
* Merge "audio: get wb amr status when ril is connected" into ics-mr0Simon Wilson2011-10-141-0/+9
|\
| * audio: get wb amr status when ril is connectedgaon.yoon2011-10-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | At the first incoming call, wb amr callback time is faster than ril-connecting time so wb status is not updated. To update wb amr status get it at ril-connecting time. HSPA supports getting wb amr status, but LTE does not support it. Change-Id: I477cb19f8ef72d5461c2800e09958f504ae733e5
* | audio HAL: support for low power audioEric Laurent2011-10-141-42/+96
|/ | | | | | | | | | | | | Implement a mechanism to dynamically switch between short and long buffers in kernel pcm driver. Using long buffer significantly decreases power consumption at the expense of latency. Therefore a hint is given to audio HAL by AudioService indicating when the screen is off and low latency is not required any more because neither video playback, VoIP/video chat or any user interaction is expected. This mechanism relies on the support for MMAP and NO IRQ write modes in tinyalsa. Change-Id: Ida9216a141750137a0592187e24a68f263ef3fbe
* Merge "audio HAL: change ALSA period size" into ics-mr0Eric Laurent2011-10-141-2/+2
|\
| * audio HAL: change ALSA period sizeEric Laurent2011-10-131-2/+2
| | | | | | | | | | | | | | ALSA period sizes must be a multiple of 24 frames to match ABE requirement. Change-Id: I52ac1d5d4a2588a1b66100bfecab6d35339fc718
* | Merge "Remove the 30 minute screen timeout option for Prime." into ics-mr0Amith Yamasani2011-10-131-0/+46
|\ \
| * | Remove the 30 minute screen timeout option for Prime.Amith Yamasani2011-10-131-0/+46
| |/ | | | | | | | | | | | | Added message ids so that new translations are not required. Bug: 5453125 Change-Id: Icde65c37a4e8e1799986238c0142bfa5d71eab5c
* | new kernel prebuiltErik Gilling2011-10-131-0/+0
|/ | | | | | | | | | | | | | | | includes: 6b69678 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 a77bcf8 Merge branch 'linux-omap-3.0' into android-omap-3.0 405b631 gpu: pvr: Update to DDK 1.8@296806 d29be5e ASoC: twl6040: The ADC debounce time is moved to twl6040 prepare 26202f8 ASoC: OMAP: HDMI: Set IP wrapper to NO-IDLE on poweron notification 03246ac usb: musb: disable mode1 dma a0762db Revert "usb: musb: Handle short packet for mode1 RX path" 1fe89de gpu: pvr: make SGXPanic dependent on PVRSRV_RESET_ON_HWTIMEOUT 1a06593 mfd: twl6030 madc: Avoid early conversion timeout on long sleep Change-Id: Ie7e5b796149b5707a68a434ec892cf9d47ca7ce8 Signed-off-by: Erik Gilling <konkers@android.com>
* tuna: update touch firmware to versions 0x55/0x35Dima Zavin2011-10-112-0/+0
| | | | | | | | | | | | | | | Updates are made to fix ghost touches on noisy circumstance, and is described below. - Configured seed value for DSP - Modified point merging algorithm which previous version was vulnerable to ghost touches on noisy state - State change between idle and active mode on noisy circumstance could cause false reference track and has been improved. - Added self-recovery logic on ESD state - not related to ghost touches. Change-Id: I488ddb4219f827ea8cee88528871381b017d9cc5 Signed-off-by: Dima Zavin <dima@android.com>
* tuna: update kernel prebuiltColin Cross2011-10-111-0/+0
| | | | | | | | | | | | | | | ab2f957 modem_if: usb_link: avoid urb deletion race fcdd94b Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7ef8379 Merge branch 'linux-omap-3.0' into android-omap-3.0 89d62b5 gpio: omap: leave edge detect bits alone in idle c1b13a9 OMAP: DSS/DSSCOMP: Wait until manager blank applies df319ac ARM: omap2: tuna: Postpone wlan regulator_get() call till the driver ini c62278a ASoC: DSP: Use START cmd for DSP_TRIGGER_PRE/POST types e2e4c14 ASoC: OMAP ABE: Update ping/pong mode to support 4 buffers. 3a5ab59 OMAP4: tuna: power: Update for battery temperature interface changes 49ddad6 power: max17040: Allow negative battery temperatures Change-Id: I50071b1292e3e4970059aa7f3081acc9062bb295
* tuna: create a symlink for hdcp_keysDima Zavin2011-10-112-2/+23
| | | | | Change-Id: I3c42817cfcd581d211c29e756285cb7db0a14f7d Signed-off-by: Dima Zavin <dima@android.com>
* tuna: update kernel prebuiltColin Cross2011-10-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d60771f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bbb9f81 Merge branch 'linux-omap-3.0' into android-omap-3.0 c71e41e OMAP4: sram: Mapping 4K of Public internal memory to kernel a2a27f5 OMAP:DSS2: Fix FIFO threshold calculation 0e9302d OMAP DSS: FIFO Threshold Optimization 37824f0 OMAP4: DSS: Enable bufferfilling by default bd21a9f omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active. 6e60e1a ARM: omap4: tuna: enable HDCP in defconfig 9b890e1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1185a83 Merge branch 'linux-omap-3.0' into android-omap-3.0 0d028b7 OMAP4: HDCP: clean up debugging output 374f46d OMAP4: HDCP: Add menuconfig option for HDCP 5d81717 OMAP4: HDCP: Change authentication sequence and DDCTimeout values b617ff2 OMAP4: HDMI: Load HDCP keys before HDMI power on Notification d493e54 OMAP4: HDCP: use request_firmware to load keys 4c71791 omap4: HDCP: Add support for omap4_secure_dispatch call cc029a1 OMAP4: HDCP: Register as misc device fbb2654 OMAP4: HDCP: Add interrupt handling to enable HDCP authentication 70469ed OMAP4: HDCP: Add support for HDCP in OMAP4 driver afb47e8 ASoC: OMAP: HDMI: Set audio configuration after power ON event 4a15a2c OMAP4: HDMI: Workaround: wait for audio to be off before cutting PHY power c4fb6d1 OMAP4:HDMI: Add power off/on notification during HDMI reconfiguration db4462a OMAP3+: PM: VP: control log for forceupdate failure 96d2281 OMAP3+: PM: VP: additional information for tracing issues 11673a7 OMAP3+: PM: VP: check to ensure VP is idle before forceupdate 2bbb1ca OMAP: DSS: panel-s6e8aa0: elvss pulse use only 0-4bits in D1h 3rd parameter. 808183a OMAP3+: PM: VP: ensure VP is idle before disable Change-Id: I816ddea6683a53c294b08137ac8ec9f757157c48
* Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-100-0/+0
|\ | | | | | | Change-Id: Ieb6301c61e3b3662904bea154043c3717fea2d3e
| * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-090-0/+0
| |\
* | \ Merge "silence sensor HAL"Mathias Agopian2011-10-101-2/+3
|\ \ \
| * | | silence sensor HALMathias Agopian2011-10-101-2/+3
| | | | | | | | | | | | | | | | Change-Id: I2a2382a73ff6615cc1148ec838fa188964a9d1d4
* | | | am 01268b43: (-s ours) New Prime prebuilt for factoryromPaul Eastham2011-10-100-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '01268b43dbba4e448bf071096e51770c9ff51687': New Prime prebuilt for factoryrom
| * | | New Prime prebuilt for factoryromPaul Eastham2011-10-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b96c09 usb: core: respect the NO_RESET_RESUME quirk f7b7095 usb: ehci: omap4xx: re-enumeration workaround refined 67a1b70 usb: ehci-omap: implement ulpi helpers Change-Id: If40351b78df2f94f7b62d553aa13077295ebc8b9
* | | | Merge "audio: bypass resampler for HDMI audio"Simon Wilson2011-10-101-22/+32
|\ \ \ \
| * | | | audio: bypass resampler for HDMI audioSimon Wilson2011-10-061-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native 44.1kHz will be used for HDMI audio since the output device supports it. Change-Id: I60eebf2556c0384e2a4c21150bee2fbbbd5ca6fd
* | | | | new kernel prebuiltErik Gilling2011-10-101-0/+0
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 23506ba Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 513de6f Merge branch 'linux-omap-3.0' into android-omap-3.0 ca39a04 gpu: pvr: Update to DDK 1.8@295945 eaa8d0e ARM: omap4: tuna: change adc range of 3 way buttons. 56670ae OMAP4: temp_sensor: Update T_SHUT temperature value to 110C d48af24 mfd: twl6030 madc: disable when not in use 2cfe356 ARM: omap4: tuna: Add support for POGO detection Change-Id: I627dbd951d6247b5c04e853dc42d6ec453db0c4f Signed-off-by: Erik Gilling <konkers@android.com>
* | | | require new bootloader PRIMEKJ02Ed Heyl2011-10-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: I72cb1f7ee575ef624099633748317f06dca79b57
* | | | tuna: enable off mode based on propertyColin Cross2011-10-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If property persist.sys.tuna.off_mode is 1, enable off mode. To enable off mode: adb root adb shell setprop persist.sys.tuna.off_mode 1 Change-Id: I01ce285dd2bd42b41b0432e142a6d63442ca7479
* | | | Updated kernel prebuiltColin Cross2011-10-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffc2b67 ASoC: Tuna: Enable/disable TWL6040 external 32kHz clock 8e59ea2 OMAP4: tuna: Add CLK32KAUDIO supply for TWL6040 e6df33d ARM: omap4: tuna: hold clk32kaudio for BT b170253 ARM: omap: tuna: enable/disable clk32kaudio for wlan b687b8f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 790a509 Merge branch 'android-3.0' into android-omap-3.0 1cd3de1 Merge branch 'linux-omap-3.0' into android-omap-3.0 4e93124 regulator: TWL6030: add clk32kaudio as regulator 9cbcbe7 usb: core: respect the NO_RESET_RESUME quirk bc90e68 usb: ehci: omap4xx: re-enumeration workaround refined f034a16 usb: ehci-omap: implement ulpi helpers 8493beb netfilter: xt_qtaguid: fix crash on ctrl delete command 1c7f07e ASoC: ABE HAL: Use second-order filter for DL2EQ 450Hz HP profile 3bc18c7 bridge: Have tx_bytes count headers like rx_bytes. Change-Id: I25a535c2435018bab93a23f7dbabde9edc49eb85
* | | | am 8ab85c13: Merge "Update melfas firmware to versions 0x34/0x54." into ↵Dima Zavin2011-10-090-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | ics-factoryrom * commit '8ab85c1349a1c30a2d3c1910d2e05416e410d028': Update melfas firmware to versions 0x34/0x54.
| * | | Merge "Update melfas firmware to versions 0x34/0x54." into ics-factoryromDima Zavin2011-10-092-0/+0
| |\ \ \
| | * | | Update melfas firmware to versions 0x34/0x54.Dima Zavin2011-10-072-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug that can cause 'missing reference value track'. i.e. firmware loses tracking and gives a touch on still. The bug could have produced a touch fail on thermal variation or long term usage without putting TSP into sleep mode / wake up. Change-Id: I47ff95ac1b552c3af6e37a929b64b60fc3e818a9 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Update melfas firmware to versions 0x34/0x54.Dima Zavin2011-10-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug that can cause 'missing reference value track'. i.e. firmware loses tracking and gives a touch on still. The bug could have produced a touch fail on thermal variation or long term usage without putting TSP into sleep mode / wake up. Change-Id: Ieee26f7e2aae12ab826048f55ed8232c1dd590c5 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Create /data/smc directory on startupJeff Tinker2011-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4598045 Implementing secure video path on TI OMAP4 chip for ICS Change-Id: I7c81044ffefd48ac3b7c0d1b46990ef5b9ed6106
* | | | | Merge "Load the smc pa, start the daemon and set driver permissions."Jeff Tinker2011-10-072-2/+18
|\ \ \ \ \
| * | | | | Load the smc pa, start the daemon and set driver permissions.Jeff Tinker2011-10-072-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS Change-Id: I010ab638daf3630a3765cbe41b671c95a3f8bea5
| * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| |\ \ \ \ \
| | * | | | | new kernel prebuiltErik Gilling2011-10-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 9ef8e73 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 358571d Merge branch 'linux-omap-3.0' into android-omap-3.0 a0628c5 gpu: pvr: Update to DDK 1.8@295231 1209d9c net: wireless: bcmdhd: Fix event thread termination in case of empty queue 4bbb273 ARM: omap4: tuna: configure volume keys as wakeup capable be538f9 misc: modem_if: Remove adding useless packet size 9440fab omap_hsi: Don't make /sys/kernel/debug/hsi/*/counters world writable Change-Id: Ic57ff48ad675a6e6c19d25dd06d43610c4b8a825 Signed-off-by: Erik Gilling <konkers@android.com>
| | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-290-0/+0
| | | | | | |\ \ \ \ \
generated by cgit v1.1 at 2024-06-29 19:55:53 +0000