summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-05-251-6/+6
| | | | Change-Id: I5fc26962b300a9aa2a83ef5c492bb477b3ec57e2
* am f141f261: am 7cd304e9: Enable 5.1 AAC for tuna.Dave Burke2012-05-251-0/+4
|\ | | | | | | | | * commit '73cd879f64454f798057977ed5acfe5bfa893abf': Enable 5.1 AAC for tuna.
| * am 7cd304e9: Enable 5.1 AAC for tuna.Dave Burke2012-05-251-0/+4
| |\ | | | | | | | | | | | | * commit 'a1246c17b0acfc2bb255c24e85be40e48d327e6f': Enable 5.1 AAC for tuna.
| | * Enable 5.1 AAC for tuna.Dave Burke2012-05-251-0/+4
| | | | | | | | | | | | | | | Bug: 6275957 Change-Id: I391c706463f64542054a0f4532af6bc37dc7d013
* | | am 00a3cf92: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ | |/ / | | | | | | * commit 'e0bfb54eea19043ddc047d20eac734dfccb8f7f1':
| | |
| | \
| *-. \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I3581a757fbbfffa826a3171bc73154dcecfd1b95
| | | * \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | |\ \
| | * | \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am ef8e52ab: am dc85a71c: tuna: prebuilt kernelGreg Hackmann2012-05-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '520430e63c5cae2bd186319ffb4680d0089b3f3c': tuna: prebuilt kernel
| * | | | | am dc85a71c: tuna: prebuilt kernelGreg Hackmann2012-05-220-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '556f2ca4effdaa2518225831795e010d9f652b29': tuna: prebuilt kernel
| | * | | | tuna: prebuilt kernelGreg Hackmann2012-05-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa78a4e ARM: omap4: tuna: attach to USB when MHL negotiation fails 1536e74 misc: fsa9480: detect powered AV cables (non-365K) Change-Id: I09dec23ac9f06171a3fe6361de110b3d15f456b0 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | am a12be91b: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '4bac4cf2ae1e30661715a260505684de9bc059d2':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Iffcf07dbe2e7cc6426557aef733a091c4724cc8d
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | | | |\ \ | | | | |/ / / | | | |/| / / | | | | |/ /
* | | | | | am 777f7c1a: am 007efa23: tuna: prebuilt kernelTodd Poynor2012-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6aa5a1dd10921a97ae0cf0d9c73923df4ea1bfbd': tuna: prebuilt kernel
| * | | | | am 007efa23: tuna: prebuilt kernelTodd Poynor2012-05-210-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e82e6a42cd26ab268906bd0ee8c30079b88b2d7d': tuna: prebuilt kernel
| | * | | | tuna: prebuilt kernelTodd Poynor2012-05-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41eadc3 ARM: tuna: enable DM debug option 2e2e5dc ARM: omap4: tuna: Add DM debug messages to vibrator 29ff83f ARM: omap: dmtimer: add omap_dm_timer_dump_regs function 2348a64 video: fbmod: parse audio blocks from EDID Change-Id: I3455314aff6878132dee5f965b4d3a82093e1fa9
* | | | | | am 7ec9c174: am 51b2bc4f: new kernel prebuiltErik Gilling2012-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'adac158be9eef9da60fdfeb2fb7a1c10a47bd6ba': new kernel prebuilt
| * | | | | am 51b2bc4f: new kernel prebuiltErik Gilling2012-05-210-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '22e903c97fb9cbc451620bfd93e76ec59965c81c': new kernel prebuilt
| | * | | | new kernel prebuiltErik Gilling2012-05-210-0/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 7ff7568 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 d3030a7 Merge branch 'linux-omap-3.0' into android-omap-3.0 786e99b OMAPDSS: DISPC: Fix rounding error in scaling decision Change-Id: I7123985ef68d1b3c21f07931d95b9a45fafdbd2f
* | | | | am 612e0921: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '30d6a24095d0cd1afa4e60df5e283e32f948e870': tuna: kernel prebuilt
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: I8d2ffb18655b09af2f4ecc4e4b18c86e9f280faf
| | | * | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | | |\ \ | | |/ / /
| | * | | tuna: kernel prebuiltDmitry Shmidt2012-05-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1244eba1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c14a1079 Merge branch 'android-3.0' into android-omap-3.0 605a4932 net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTL f242b6d8 net: wireless: bcmdhd: Check return value from dhd_dev_init_ioctl() b9fd9e23 net: wireless: bcmdhd: Fix WARN_ON(!res->pub.channel) 08cad5bc net: wireless: bcmdhd: Change singal pending return value from -110 to -4 8dd07181 Revert "HACK: input: mms_ts: Log a touch event after driver enable." 1f0627de USB: gadget: f_audio_source: New gadget driver for audio output 71c42632 USB: gadget: f_accessory: Add support for HID input devices 319e8228 Add ACCESSORY_SET_AUDIO_MODE control request and ioctl BUG: b/6005966, b/6493671, b/6335854, b/6457409 Change-Id: I0a5ed09e46ae2d38f6218dcdc8564064d5ae46b5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am 7c3d0c08: am e804033d: tuna: prebuilt kernelJP Abgrall2012-05-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '37d1a7d35ac2403aeec6cee7261888490364a44b': tuna: prebuilt kernel
| * | | | am e804033d: tuna: prebuilt kernelJP Abgrall2012-05-180-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '0a144704ab6b88e0735bf3cacd9d5858c5a59426': tuna: prebuilt kernel
| | * | | tuna: prebuilt kernelJP Abgrall2012-05-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ace10fe ARM: configs: tuna: disable bridge netfiltering Bug:6493179 Change-Id: Id26b3d8268b27ec3e67861435d89fee90f203dac
* | | | | am 5584106e: am 7a44825f: tuna: kernel prebuiltDmitry Shmidt2012-05-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '33deae5cc1987add9fed089285cb4e86eb2c7644': tuna: kernel prebuilt
| * | | | am 7a44825f: tuna: kernel prebuiltDmitry Shmidt2012-05-170-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2862455de49fc9b3a1541dba922df136f2a5185b': tuna: kernel prebuilt
| | * | | tuna: kernel prebuiltDmitry Shmidt2012-05-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1244eba1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c14a1079 Merge branch 'android-3.0' into android-omap-3.0 605a4932 net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTL f242b6d8 net: wireless: bcmdhd: Check return value from dhd_dev_init_ioctl() b9fd9e23 net: wireless: bcmdhd: Fix WARN_ON(!res->pub.channel) 08cad5bc net: wireless: bcmdhd: Change singal pending return value from -110 to -4 8dd07181 Revert "HACK: input: mms_ts: Log a touch event after driver enable." 1f0627de USB: gadget: f_audio_source: New gadget driver for audio output 71c42632 USB: gadget: f_accessory: Add support for HID input devices 319e8228 Add ACCESSORY_SET_AUDIO_MODE control request and ioctl BUG: b/6005966, b/6493671, b/6335854, b/6457409 Change-Id: I0a5ed09e46ae2d38f6218dcdc8564064d5ae46b5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am 1a4375e2: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d47fe8b03e555b20ffdb5363f6d0361590b4fb0': tuna: kernel prebuilt tuna: prebuilt kernel (locally built) Remove keystore.tuna.so from product build tuna: kernel prebuilt new kernel prebuilt
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: I2ce887c108a0767e557b5cdc8aa8835e151398cc
| | | * | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | | |\
| | * | | \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-090-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-030-0/+0
| | | | | | | | | |\
| | | | | | | | | | * tuna: kernel prebuiltDmitry Shmidt2012-05-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2cb75c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 072c198 Merge branch 'android-3.0' into android-omap-3.0 d60ec08 net: wireless: bcmdhd: Update to Version 5.90.195.61 216527e net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails BUG: b/6388856, b/6005966 Change-Id: Ie8eab8791d927c54a6ca9c788977d06d011bae9a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-260-0/+0
| | | | | | | | | | | | | |\