Robert Greenwalt
|
abc7387e26
|
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
|
2012-02-14 13:39:25 -08:00 |
|
Stephen Hines
|
a36d13b389
|
Merge "Fix typos/spacing with new APIs."
|
2012-02-14 13:38:43 -08:00 |
|
Robert Greenwalt
|
34297ab3a2
|
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
|
2012-02-14 13:38:15 -08:00 |
|
Robert Greenwalt
|
b34f2b22a3
|
Merge "Add a config to set Dun capabilities." into ics-mr1
|
2012-02-14 13:37:44 -08:00 |
|
Stephen Hines
|
e8f4b3ced4
|
Merge "Initialize all class members."
|
2012-02-14 13:35:21 -08:00 |
|
Justin Ho
|
37eb849a1c
|
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
|
2012-02-14 13:31:28 -08:00 |
|
Justin Ho
|
3386c8d680
|
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
|
2012-02-14 13:31:00 -08:00 |
|
Joe Fernandez
|
f1c2aba8d3
|
am c9f1eb20: am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit 'c9f1eb20033d50dadbe028985bedc5022c50ce4c':
|
2012-02-14 13:30:50 -08:00 |
|
Mike Lockwood
|
c21756fc12
|
am ac7ab269: am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ac7ab269e5a8c3d25ac243efcc92cc791002e6b9':
|
2012-02-14 13:30:47 -08:00 |
|
John Wang
|
0068060026
|
am 71bece56: am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '71bece56377896f4799a6d480c459c4344050e64':
|
2012-02-14 13:30:46 -08:00 |
|
Justin Ho
|
cfcb3a71aa
|
Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
|
2012-02-14 13:29:08 -08:00 |
|
Joe Fernandez
|
0b288fe888
|
am 08851a53: am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '08851a53a147a4022a37fb61ba17fd2876d2afc5':
docs: Android NDK r7b Release Notes
|
2012-02-14 13:08:04 -08:00 |
|
Mike Lockwood
|
85151b484d
|
am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 13:08:01 -08:00 |
|
John Wang
|
00ca8b281b
|
am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '0b17fc360185ca7b9d05a096b0033ddd8d883940':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 13:07:58 -08:00 |
|
Joe Fernandez
|
39c1418277
|
am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':
|
2012-02-14 13:06:16 -08:00 |
|
Mike Lockwood
|
0a67a5f509
|
am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '5f423d88753e7c123527d4b7b940788eb2c94821':
|
2012-02-14 13:06:14 -08:00 |
|
John Wang
|
3cd75c2cc8
|
am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '749b32dfe6ece3ce6ced71d05351a1139d4a4cd4':
|
2012-02-14 13:06:11 -08:00 |
|
Teng-Hui Zhu
|
b0a101f5d7
|
Merge "Update the scale while updating the drawGL functor"
|
2012-02-14 12:51:19 -08:00 |
|
Joe Fernandez
|
189e00f454
|
am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '57f55d7f9cc1d194054020fcb4e6226579818e27':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:42:44 -08:00 |
|
Mike Lockwood
|
c6398818df
|
am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'b9be8eff222d9b70079dd53d0d61de229d8d7914':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:42:42 -08:00 |
|
John Wang
|
44ff4eeafa
|
am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:42:40 -08:00 |
|
Joe Fernandez
|
b8c7b5e19b
|
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:37:43 -08:00 |
|
Mike Lockwood
|
08082daf8c
|
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:37:40 -08:00 |
|
John Wang
|
fab67d1b13
|
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:37:38 -08:00 |
|
Joe Fernandez
|
e8c0c352bc
|
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
|
2012-02-14 12:37:18 -08:00 |
|
Mike Lockwood
|
14936f136c
|
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
|
2012-02-14 12:37:16 -08:00 |
|
John Wang
|
74786c5669
|
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
|
2012-02-14 12:37:14 -08:00 |
|
Mathias Agopian
|
f234ad0081
|
Merge changes I7a6b9db4,Ib579f580
* changes:
EGLConfig is now not remaped to an internal EGLConfig
remove multiplexing of multiple EGL implementation
|
2012-02-14 12:35:02 -08:00 |
|
Joe Fernandez
|
a9c71f71e6
|
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
|
2012-02-14 12:05:25 -08:00 |
|
Mike Lockwood
|
51551a81ec
|
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
|
2012-02-14 11:30:05 -08:00 |
|
John Wang
|
06ea772a19
|
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
|
2012-02-14 10:09:26 -08:00 |
|
Jean-Baptiste Queru
|
b49329ac18
|
Merge from master
Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61
|
2012-02-14 10:06:49 -08:00 |
|
Jean-Baptiste Queru
|
cb4c6ef4d7
|
Merge from master
Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b
|
2012-02-14 10:04:12 -08:00 |
|
Guang Zhu
|
f4ee9365bd
|
Merge "disable cpu_upload path workaround"
|
2012-02-14 10:02:44 -08:00 |
|
Jean-Baptiste Queru
|
a9360fa5f6
|
Merge from master
Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
|
2012-02-14 09:57:40 -08:00 |
|
Ying Wang
|
944380f980
|
Merge "Build all font files as prebuilts."
|
2012-02-14 09:53:36 -08:00 |
|
Glenn Kasten
|
dec3d1e8a8
|
Merge "Fix races related to volume and mute"
|
2012-02-14 09:44:47 -08:00 |
|
Glenn Kasten
|
f9401a6584
|
am 4f7adcf7: Merge "Update comments"
* commit '4f7adcf76a6f97076c05720d9c20a221a57692cb':
Update comments
|
2012-02-14 09:43:45 -08:00 |
|
Glenn Kasten
|
57caadb4d3
|
Merge "Update comments"
|
2012-02-14 09:42:32 -08:00 |
|
Chet Haase
|
8d139a65da
|
am c87b0084: Merge "Refactor animation code in new Draw() method into its own method."
* commit 'c87b0084e3dbf5c0862d29f039ee908bccf39e9d':
Refactor animation code in new Draw() method into its own method.
|
2012-02-14 09:22:10 -08:00 |
|
Chet Haase
|
486eb9999e
|
Merge "Refactor animation code in new Draw() method into its own method."
|
2012-02-14 09:19:59 -08:00 |
|
Glenn Kasten
|
87548ee2b3
|
Update comments
We no longer put the filename at start of file.
Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
|
2012-02-14 09:17:59 -08:00 |
|
Glenn Kasten
|
aff2aa71f5
|
am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop"
* commit 'f4e1bdc13e0c9bb6352e458bef283dfc7165e23f':
Remove dead code AudioTrack::getLoop
|
2012-02-14 09:10:39 -08:00 |
|
Glenn Kasten
|
a83498dd77
|
am 150d238f: Use size_t and ssize_t with Vector
* commit '150d238f3a5218846c5f16e64958079d22ac11c4':
Use size_t and ssize_t with Vector
|
2012-02-14 09:10:36 -08:00 |
|
Glenn Kasten
|
76b8ef8030
|
Merge "Remove dead code AudioTrack::getLoop"
|
2012-02-14 09:09:03 -08:00 |
|
Glenn Kasten
|
7655105fdb
|
am d23d2b16: Merge "AudioRecord and AudioTrack client tid"
* commit 'd23d2b1662dc61222541310f7297cbee4e8b2b9d':
AudioRecord and AudioTrack client tid
|
2012-02-14 09:03:03 -08:00 |
|
Glenn Kasten
|
bf40a3bc13
|
Merge "AudioRecord and AudioTrack client tid"
|
2012-02-14 09:01:04 -08:00 |
|
Ramanan Rajeswaran
|
c0a97970ca
|
am c26b3a7f: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit 'c26b3a7f12da9f5d495378749a098811a29daf85':
DO NOT MERGE
|
2012-02-14 07:39:29 -08:00 |
|
Ramanan Rajeswaran
|
c15e1d1315
|
am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit '128dfa514818399ff8b5fde56fa487374f6fd504':
DO NOT MERGE
|
2012-02-14 07:36:53 -08:00 |
|
Ramanan Rajeswaran
|
8bc199687c
|
Merge "DO NOT MERGE" into ics-scoop-plus-aosp
|
2012-02-14 07:35:13 -08:00 |
|