summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-12Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergetools_r22.2The Android Open Source Project
Change-Id: Ic11a71a5f1f5b0d2032082dfeacbbeab27389e71
2013-06-12merge in jb-mr2-zeroday-release history after reset to jb-mr2-devandroid-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2jb-mr2.0-releaseThe Android Automerger
2013-06-11tuna: prebuilt kernel (ashmem deadlock)android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9jb-mr2-releaseTodd Poynor
fb3c9ac ashmem: avoid deadlock between read and mmap calls Bug: 9261835 Change-Id: Idee2ef89aa2d1cb88bd39cdadf6f1e1630c2ae40
2013-06-11am 8c9a2418: tuna: prebuilt kernel (ashmem deadlock)Todd Poynor
* commit '8c9a241892d74ecb09c1c9a5eef0848c354f3fb6': tuna: prebuilt kernel (ashmem deadlock)
2013-06-10tuna: prebuilt kernel (ashmem deadlock)android-4.3_r3.1android-4.3_r3android-4.3.1_r1jb-mr2.0.0-releasejb-mr2-devTodd Poynor
fb3c9ac ashmem: avoid deadlock between read and mmap calls Bug: 9261835 Change-Id: Idee2ef89aa2d1cb88bd39cdadf6f1e1630c2ae40
2013-06-06Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project
Change-Id: I8dbb751759f10ec2d0dc69bd2e12104df939da83
2013-06-06Forward-compatibilityJean-Baptiste Queru
Change-Id: I250ea04ae6fadb66de8b5551573e199745f4f1ad
2013-06-05merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger
2013-06-03Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project
Change-Id: I0a3ac3cb5efeae22ac8034653d6e352e6cc5579a
2013-06-03tuna: prebuilt kernel (no modules)Todd Poynor
fbc1a9d arm: OMAP4: tuna: turn off module support Change-Id: Ia0f52a7e918ae9e276913298f1ac43a6cdb06176
2013-06-03am 75634c18: tuna: prebuilt kernel (no modules)Todd Poynor
* commit '75634c18730877dfaeba1b81855c2104c2a94285': tuna: prebuilt kernel (no modules)
2013-06-03tuna: prebuilt kernel (no modules)Todd Poynor
fbc1a9d arm: OMAP4: tuna: turn off module support Change-Id: Ia0f52a7e918ae9e276913298f1ac43a6cdb06176
2013-05-31am 9f7598c2: (-s ours) Merge "tuna: correct bluetooth name"Jean-Baptiste Queru
* commit '9f7598c27376c5d08eb9fb9b0489296a5e60d8d5': tuna: correct bluetooth name
2013-05-31Merge "tuna: correct bluetooth name"jb-mr1.1-dev-plus-aospJean-Baptiste Queru
2013-05-16Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project
Change-Id: If97525d2093797d2ad93e0141b858f18dd4811c3
2013-05-15merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-14am 2a9b101a: tuna: prebuilt kernel (perf_event_open security fix)Todd Poynor
* commit '2a9b101aca076aa1b84fcaa8a2d94aaa110c5df5': tuna: prebuilt kernel (perf_event_open security fix)
2013-05-14tuna: prebuilt kernel (perf_event_open security fix)Todd Poynor
d0618c1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 00349b5 Merge branch 'android-3.0' into android-omap-3.0 db73373 perf: Treat attr.config as u64 in perf_swevent_init() Change-Id: Ib971763f99552568f10cc5e06461171f56b210ad Bugs: 8962304
2013-05-13merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-10am 49f67e13: Merge "Clean up bluetooth le feature file" into jb-mr2-devMatthew Xie
* commit '49f67e134cd11c29066daf836d1016472e6b25bf': Clean up bluetooth le feature file
2013-05-10Merge "Clean up bluetooth le feature file" into jb-mr2-devMatthew Xie
2013-05-09tuna: correct bluetooth namesomething15525
This commit changes the device name from what is reflected in AOSP (Galaxy Nexus 2) to a more appropriate name (Galaxy Nexus). This will correct the name in the Bluetooth pane in Settings. Change-Id: Iad4671eb257d1a9b2a14f581624c98feddec9326
2013-05-09Clean up bluetooth le feature fileMatthew Xie
bug 8664724 Change-Id: I2a092694c2b21fe39db6e5ed484020b85a2eb202
2013-05-09am 55272b3a: Turn off BLE, GATT, and SMP of Bluetooth stackMatthew Xie
* commit '55272b3a4e917143012a77d937ca2670ec26e0fb': Turn off BLE, GATT, and SMP of Bluetooth stack
2013-05-09Turn off BLE, GATT, and SMP of Bluetooth stackMatthew Xie
bug 8664724 Change-Id: Ic84c089fb892e7b5c06beb0245347b97ca497216
2013-05-08Turn off BLE, GATT, and SMP of Bluetooth stackMatthew Xie
bug 8664724 Change-Id: Ic84c089fb892e7b5c06beb0245347b97ca497216
2013-05-06merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-02resolved conflicts for merge of 4e81ea71 to jb-mr2-dev-plus-aospBen Gruver
Change-Id: Ibbd69ebce60f4e59968ee22b96712e1d980b590a
2013-05-02Add label for accelerometer deviceBen Gruver
Change-Id: I5950eb8accd7bb93559aad0104b6d90f6db21fa7
2013-05-02am d297c277: Move rule for dsscomp to its own sectionBen Gruver
* commit 'd297c277f378c11625536b40b73e810fac322b85': Move rule for dsscomp to its own section
2013-05-02Move rule for dsscomp to its own sectionBen Gruver
Change-Id: Ifb66070f2b2caaa2f95ddc5eb98c66a011c38218
2013-05-02am 0d195aea: Label dsscomp as graphics_device for tunaBen Gruver
* commit '0d195aeaef77de9aa9855354984a39617267fc05': Label dsscomp as graphics_device for tuna
2013-05-02Label dsscomp as graphics_device for tunaBen Gruver
Change-Id: I1e8f623799fe015e83b433236eb76ad68ac3af5d
2013-05-01merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-04-30am ae3c9e2e: tuna: prebuilt kernel (shutdown hang, SELinux)Todd Poynor
* commit 'ae3c9e2e6ab1bb017b6813b4c07c99c420d96863': tuna: prebuilt kernel (shutdown hang, SELinux)
2013-04-30am d0c5b64c: Merge "tuna: require bootloader PRIMEMD04" into jb-mr2-devTodd Poynor
* commit 'd0c5b64cd85656bf29ccda3770343252c9f7a9a6': tuna: require bootloader PRIMEMD04
2013-04-30tuna: prebuilt kernel (shutdown hang, SELinux)Todd Poynor
29a0751 Enable SELinux and its dependencies. d6b0486 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 958dc5c Merge branch 'android-3.0' into android-omap-3.0 59bc192 Add permission checking for binder IPC. d893646 HACK: tuna: blank screen at reboot time 01778ce HACK: tuna: dss: skip shutdown at reboot Bug: 6816255 Bug: 8352128 Change-Id: Ia676446246dc4c1b33f294f67fa1d2343d459e79
2013-04-30Merge "tuna: require bootloader PRIMEMD04" into jb-mr2-devTodd Poynor
2013-04-30merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-04-29tuna: require bootloader PRIMEMD04Todd Poynor
Bug: 8489455 Change-Id: I022fd4b5ce81d562e62b93c8d335e489c513b078
2013-04-29am 9b0105a9: Remove wifi_p2p network.Robert Greenwalt
* commit '9b0105a92565ad9a75d92fe115a4ff3f028ed0d4': Remove wifi_p2p network.
2013-04-29Remove wifi_p2p network.Robert Greenwalt
The state tracker wasn't really reporting p2p info anyway so this was broken and was confusing people as it used straight wifi as its type, giving 2 wifi networks and generating extra broadcasts. bug:8658717 Change-Id: I3deb0c62e8112abb0bbd546f00f167d58047775f
2013-04-26tuna: wlan: Add wpa_supplicant overlay file supportDmitry Shmidt
Bug: 8725307 Change-Id: I4bfe6887086517f0901033b3b68ad39e0999ab16 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-04-26am 34c14143: tuna: wlan: Add wpa_supplicant overlay file supportDmitry Shmidt
* commit '34c1414368114bb8c8bbbfbc908831cd955f73f6': tuna: wlan: Add wpa_supplicant overlay file support
2013-04-25tuna: wlan: Add wpa_supplicant overlay file supportDmitry Shmidt
Bug: 8725307 Change-Id: I4bfe6887086517f0901033b3b68ad39e0999ab16 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-04-25merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-04-24Merge commit '463af460' into manualmergeGeremy Condra
Conflicts: sepolicy/file_contexts Change-Id: Ib879180bd8150f959805d38fb132c9048655cf6e
2013-04-24Move dsscomp out to main selinux policy.repo sync
Bug: 4070557 Change-Id: If6bf5e6adadaea61cc25ff91f066222143b9cfba
2013-04-24merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-04-23am 0ac74840: Copy android.hardware.bluetooth_le.xml permission fileMatthew Xie
* commit '0ac748409485c578584a0cb374ee642bb4c5c5e6': Copy android.hardware.bluetooth_le.xml permission file
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 23:38:30 +0000