OSDN Git Service
The Android Open Source Project [Sat, 7 Jan 2012 08:42:11 +0000 (00:42 -0800)]
Romain Guy [Sat, 7 Jan 2012 08:42:01 +0000 (00:42 -0800)]
am
bc5d876d: Avoid allocating when performing the measure/layout passes
* commit '
bc5d876df0856e027f1e2cfce91cbdedb6aaf66f':
Avoid allocating when performing the measure/layout passes
The Android Open Source Project [Sat, 7 Jan 2012 02:18:36 +0000 (18:18 -0800)]
am
20090b30: Reconcile with ics-mr1-release
* commit '
20090b30340f9382a2eca6a9bed21117f7a27d7e':
The Android Open Source Project [Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
Marco Nelissen [Sat, 7 Jan 2012 00:42:30 +0000 (16:42 -0800)]
am
2ef4b663: Merge "New UX calls for dialogs without titles."
* commit '
2ef4b6630bb0fc6213df09ab6a58c5c8195c035a':
New UX calls for dialogs without titles.
Marco Nelissen [Sat, 7 Jan 2012 00:40:02 +0000 (16:40 -0800)]
Merge "New UX calls for dialogs without titles."
The Android Automerger [Sat, 7 Jan 2012 00:32:11 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
John Reck [Sat, 7 Jan 2012 00:05:59 +0000 (16:05 -0800)]
am
1986ed76: Merge "Update WebSettings.PREVIOUS_VERSION"
* commit '
1986ed76d25d7c38049df4125c9d19d6626d03a8':
Update WebSettings.PREVIOUS_VERSION
John Reck [Sat, 7 Jan 2012 00:03:59 +0000 (16:03 -0800)]
Merge "Update WebSettings.PREVIOUS_VERSION"
Eino-Ville Talvala [Fri, 6 Jan 2012 23:53:33 +0000 (15:53 -0800)]
am
143c7c88: am
4bc873e6: am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
143c7c885487ff665ad87c259d4b3b089d0bfec4':
Switch camera sounds to always use the system enforced audio stream.
Eino-Ville Talvala [Fri, 6 Jan 2012 23:51:44 +0000 (15:51 -0800)]
am
4bc873e6: am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
4bc873e6ff73200af866f8c9efca66ad8ed23682':
Switch camera sounds to always use the system enforced audio stream.
Bart Sears [Fri, 6 Jan 2012 23:51:12 +0000 (15:51 -0800)]
am
9f0dfcd6: am
c2eaee53: (-s ours) am
a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit '
9f0dfcd64a764126359553933fdd6a766f6565d8':
getDuration can be only called after prepared. DO NOT MERGE
Bart Sears [Fri, 6 Jan 2012 23:49:26 +0000 (15:49 -0800)]
am
c2eaee53: (-s ours) am
a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit '
c2eaee533fe25cd9a0781f349e9c8c7ef02bd648':
getDuration can be only called after prepared. DO NOT MERGE
Eino-Ville Talvala [Fri, 6 Jan 2012 23:49:17 +0000 (15:49 -0800)]
am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
Bart Sears [Fri, 6 Jan 2012 23:47:04 +0000 (15:47 -0800)]
am
a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit '
a476eed6b291d06f5e571597b928b7b2f0b3f257':
getDuration can be only called after prepared. DO NOT MERGE
Eino-Ville Talvala [Fri, 6 Jan 2012 23:46:36 +0000 (15:46 -0800)]
Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
Bart Sears [Fri, 6 Jan 2012 23:45:13 +0000 (15:45 -0800)]
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
Nick Kralevich [Fri, 6 Jan 2012 22:52:26 +0000 (14:52 -0800)]
am
cdc6b16f: Merge "Don\'t allow reading of packagelist files."
* commit '
cdc6b16f1bece7cd07b283b9b273f05fe895010e':
Don't allow reading of packagelist files.
Nick Kralevich [Fri, 6 Jan 2012 22:50:53 +0000 (14:50 -0800)]
Merge "Don't allow reading of packagelist files."
Dan Morrill [Fri, 6 Jan 2012 22:42:44 +0000 (14:42 -0800)]
am
74366c06: Merge "Minor tweak to console output."
* commit '
74366c06ff6cad7038c17c9041d25979975ce55e':
Minor tweak to console output.
Dan Morrill [Fri, 6 Jan 2012 22:39:11 +0000 (14:39 -0800)]
Merge "Minor tweak to console output."
Wink Saville [Fri, 6 Jan 2012 22:35:20 +0000 (14:35 -0800)]
am
bbfec33d: am
f817e941: am
2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '
bbfec33d946aa66a2f1414d4f1ec69a5f2b80134':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Wink Saville [Fri, 6 Jan 2012 22:32:37 +0000 (14:32 -0800)]
am
f817e941: am
2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '
f817e9413356de2a303e14709e67457190e976c9':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Wink Saville [Fri, 6 Jan 2012 22:30:20 +0000 (14:30 -0800)]
am
2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '
2f143a966ccfec71de2c3a9785f5f3f47d418acb':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Wink Saville [Fri, 6 Jan 2012 22:27:56 +0000 (14:27 -0800)]
Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
Fabrice Di Meglio [Fri, 6 Jan 2012 22:26:04 +0000 (14:26 -0800)]
am
5c9fe80e: am
42e231bf: (-s ours) am
c1d03cff: Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit '
5c9fe80e7ad05de5da0c4ef753280b4f2507cf98':
Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
Fabrice Di Meglio [Fri, 6 Jan 2012 22:23:29 +0000 (14:23 -0800)]
am
42e231bf: (-s ours) am
c1d03cff: Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit '
42e231bf4a9995c334fa134aa21f859fa1f719fc':
Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
Fabrice Di Meglio [Fri, 6 Jan 2012 22:20:41 +0000 (14:20 -0800)]
am
c1d03cff: Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit '
c1d03cff271d81fc9948648583e9e07c0c624dc1':
Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
Fabrice Di Meglio [Fri, 6 Jan 2012 22:19:20 +0000 (14:19 -0800)]
Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 6 Jan 2012 22:16:33 +0000 (14:16 -0800)]
am
1317108e: am
bc72272c: am
beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit '
1317108e18f40e5b5925d3f4a51789832cb17069':
Fixing crash when taking screenshot over secure window.
Justin Ho [Fri, 6 Jan 2012 22:16:31 +0000 (14:16 -0800)]
am
fe3eb938: am
7db47a42: am
3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '
fe3eb938ca0b6e6ac44b5571f628b8a8f5721804':
Updating default image wallpaper for tablet.
Justin Ho [Fri, 6 Jan 2012 22:13:47 +0000 (14:13 -0800)]
am
bc72272c: am
beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit '
bc72272cc07398a5dd6d7c76fb3eac91ad3e2bd8':
Fixing crash when taking screenshot over secure window.
Justin Ho [Fri, 6 Jan 2012 22:13:38 +0000 (14:13 -0800)]
am
7db47a42: am
3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '
7db47a42f1211befb015a7a9640f0c447b477228':
Updating default image wallpaper for tablet.
Justin Ho [Fri, 6 Jan 2012 22:10:01 +0000 (14:10 -0800)]
am
beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit '
beb8be60d157e4812e0195c2e445aa0abb82d9a2':
Fixing crash when taking screenshot over secure window.
Justin Ho [Fri, 6 Jan 2012 22:09:59 +0000 (14:09 -0800)]
am
3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '
3116b7a7ca6681daabbdac55e71203995e7a7afe':
Updating default image wallpaper for tablet.
Justin Ho [Fri, 6 Jan 2012 22:07:51 +0000 (14:07 -0800)]
Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
Justin Ho [Fri, 6 Jan 2012 22:07:37 +0000 (14:07 -0800)]
Merge "Updating default image wallpaper for tablet." into ics-mr1
George Mount [Fri, 6 Jan 2012 22:02:47 +0000 (14:02 -0800)]
am
5755d01d: Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."
* commit '
5755d01d2cb017e19fed94ffde6122301460133f':
Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.
George Mount [Fri, 6 Jan 2012 22:00:30 +0000 (14:00 -0800)]
Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."
Alex Sakhartchouk [Fri, 6 Jan 2012 21:07:01 +0000 (13:07 -0800)]
Merge "Adding getters to rs program obejcts." into graphics-dev
Guang Zhu [Fri, 6 Jan 2012 19:24:00 +0000 (11:24 -0800)]
am
128386ca: Merge "Small tweaks to Tile Benchmark test"
* commit '
128386ca9a32a4bbce094c30fec8bc6522f04d03':
Small tweaks to Tile Benchmark test
Guang Zhu [Fri, 6 Jan 2012 19:21:07 +0000 (11:21 -0800)]
Merge "Small tweaks to Tile Benchmark test"
Steve Block [Fri, 6 Jan 2012 18:33:23 +0000 (10:33 -0800)]
am
f4c2294b: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
* commit '
f4c2294b0156ca5a6919479142aa319963fdb727':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Steve Block [Fri, 6 Jan 2012 18:30:56 +0000 (10:30 -0800)]
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
George Mount [Fri, 6 Jan 2012 17:55:58 +0000 (09:55 -0800)]
am
d88f26e3: Merge "Clean up code using eclipse\'s automatic cleanup feature."
* commit '
d88f26e3aa11e09706211c88babbf09b5a214e93':
Clean up code using eclipse's automatic cleanup feature.
George Mount [Fri, 6 Jan 2012 17:53:01 +0000 (09:53 -0800)]
Merge "Clean up code using eclipse's automatic cleanup feature."
Alex Sakhartchouk [Fri, 6 Jan 2012 17:41:52 +0000 (09:41 -0800)]
Merge "Cleanup based on comments." into graphics-dev
Marco Nelissen [Fri, 6 Jan 2012 16:09:54 +0000 (08:09 -0800)]
am
18c6afa0: Merge "Also accept non-parenthesized genre numbers"
* commit '
18c6afa0c57074e08b8856dde306d3302834b1a9':
Also accept non-parenthesized genre numbers
Marco Nelissen [Fri, 6 Jan 2012 16:08:15 +0000 (08:08 -0800)]
Merge "Also accept non-parenthesized genre numbers"
Jonathan Dixon [Fri, 6 Jan 2012 10:22:36 +0000 (02:22 -0800)]
am
5883520f: Merge "Make WebView.HitTestResult static"
* commit '
5883520fd7c9b3426d0fcc107f647f999a0a3232':
Make WebView.HitTestResult static
Jonathan Dixon [Fri, 6 Jan 2012 10:19:31 +0000 (02:19 -0800)]
Merge "Make WebView.HitTestResult static"
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Ken Wakasa [Fri, 6 Jan 2012 03:47:06 +0000 (19:47 -0800)]
am
c42e6a0b: Merge "Comment clean up for InputMethodSubtype."
* commit '
c42e6a0bed2c88fd03466c5104d62d7f98e68768':
Comment clean up for InputMethodSubtype.
Ken Wakasa [Fri, 6 Jan 2012 03:45:30 +0000 (19:45 -0800)]
Merge "Comment clean up for InputMethodSubtype."
Rajdeep Dua [Fri, 6 Jan 2012 03:43:51 +0000 (19:43 -0800)]
am
3dc5a2ea: Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id :
5813366"
* commit '
3dc5a2eacfc6125e5299d42ac3ed64ec9e70d0fa':
Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id :
5813366
Rajdeep Dua [Fri, 6 Jan 2012 03:41:23 +0000 (19:41 -0800)]
Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id :
5813366"
Fabrice Di Meglio [Thu, 5 Jan 2012 23:21:28 +0000 (15:21 -0800)]
am
d4a69b4a: Merge "Fix bug #
5753006 Garbled Labels in Maps"
* commit '
d4a69b4a1cb5b52035345abd8cb9595ae4cf9fa5':
Fix bug #
5753006 Garbled Labels in Maps
Fabrice Di Meglio [Thu, 5 Jan 2012 23:18:52 +0000 (15:18 -0800)]
Merge "Fix bug #
5753006 Garbled Labels in Maps"
Teng-Hui Zhu [Thu, 5 Jan 2012 22:50:19 +0000 (14:50 -0800)]
am
a4ad2928: Merge "getDuration can be only called after prepared."
* commit '
a4ad2928eb47974e922191dd008dfa98e3711ca0':
getDuration can be only called after prepared.
Teng-Hui Zhu [Thu, 5 Jan 2012 22:47:01 +0000 (14:47 -0800)]
Merge "getDuration can be only called after prepared."
David Hu [Thu, 5 Jan 2012 22:41:47 +0000 (14:41 -0800)]
am
0df0ed58: Merge "BandwidthTestRunner"
* commit '
0df0ed5814a83c4cf0dd3d6d6e177f5ed9003863':
BandwidthTestRunner
David Hu [Thu, 5 Jan 2012 22:39:45 +0000 (14:39 -0800)]
Merge "BandwidthTestRunner"
Marco Nelissen [Thu, 5 Jan 2012 22:15:41 +0000 (14:15 -0800)]
am
4b4d00e7: Merge "ThumbnailUtils: To fix misuse of FileInputStream."
* commit '
4b4d00e7149f11c84614d8cc98ae7bff21dbd960':
ThumbnailUtils: To fix misuse of FileInputStream.
Marco Nelissen [Thu, 5 Jan 2012 22:11:40 +0000 (14:11 -0800)]
Merge "ThumbnailUtils: To fix misuse of FileInputStream."
Steve Block [Thu, 5 Jan 2012 22:09:25 +0000 (14:09 -0800)]
am
bd47cac4: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
* commit '
bd47cac4dfc8440a848b33107cba1d6773f3e124':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block [Thu, 5 Jan 2012 22:07:02 +0000 (14:07 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Fabrice Di Meglio [Thu, 5 Jan 2012 21:57:41 +0000 (13:57 -0800)]
am
c726ff02: Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long"
* commit '
c726ff02c7749f134885decadd2ea86877119c3d':
Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long
Fabrice Di Meglio [Thu, 5 Jan 2012 21:55:01 +0000 (13:55 -0800)]
Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long"
Scott Main [Thu, 5 Jan 2012 20:13:25 +0000 (12:13 -0800)]
am
d1a82292: am
47228cac: am
dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '
d1a8229227f1e8b81a927ef694257dfe0707c985':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
The Android Open Source Project [Thu, 5 Jan 2012 20:13:22 +0000 (12:13 -0800)]
Scott Main [Thu, 5 Jan 2012 20:09:07 +0000 (12:09 -0800)]
am
47228cac: am
dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '
47228cac900cd58d0687b6e6d980381cfc8010a1':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
The Android Open Source Project [Thu, 5 Jan 2012 20:08:48 +0000 (12:08 -0800)]
am
d32ee5ba: Reconcile with ics-mr1-release
* commit '
d32ee5baa057992431263907ec5cf8f19b43c043':
Robert Greenwalt [Thu, 5 Jan 2012 19:41:16 +0000 (11:41 -0800)]
am
32350c7a: Merge "Filter our v6 address from tethering dns."
* commit '
32350c7ab2f56b6d70437ba62f85232fd0b2c24a':
Filter our v6 address from tethering dns.
Robert Greenwalt [Thu, 5 Jan 2012 19:39:26 +0000 (11:39 -0800)]
Merge "Filter our v6 address from tethering dns."
Scott Main [Thu, 5 Jan 2012 17:45:19 +0000 (09:45 -0800)]
am
dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '
dacbf67ab915fa8b987f6fb9f044160af92652cd':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
Scott Main [Thu, 5 Jan 2012 17:42:52 +0000 (09:42 -0800)]
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
Alex Sakhartchouk [Thu, 5 Jan 2012 17:29:41 +0000 (09:29 -0800)]
Merge "Adding light script to scenegraph. Patching up the collada parser to handle data from different converters." into graphics-dev
Glenn Kasten [Thu, 5 Jan 2012 16:21:37 +0000 (08:21 -0800)]
am
6b14d585: Merge "Remove the notion of "active track" from mixer"
* commit '
6b14d5858056d49d2cd2162cd043908794e5a4df':
Remove the notion of "active track" from mixer
Glenn Kasten [Thu, 5 Jan 2012 16:20:10 +0000 (08:20 -0800)]
Merge "Remove the notion of "active track" from mixer"
The Android Open Source Project [Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
Glenn Kasten [Thu, 5 Jan 2012 15:40:36 +0000 (07:40 -0800)]
am
a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
* commit '
a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
Use the standard CC_LIKELY and CC_UNLIKELY macros
Glenn Kasten [Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)]
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
Glenn Kasten [Thu, 15 Dec 2011 17:51:17 +0000 (09:51 -0800)]
Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose. So rename the private
uses to use the standard names.
In addition, AudioFlinger was relying on the macro expanding to extra ( ).
Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
Wink Saville [Thu, 5 Jan 2012 05:55:03 +0000 (21:55 -0800)]
am
9a03482c: am
3ed28036: am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
9a03482c66b2f5c30c7fde38216239a1f233df02':
Enhancement on ICS data stall polling logic
Wink Saville [Thu, 5 Jan 2012 05:55:00 +0000 (21:55 -0800)]
am
efd617e0: am
0ad96f89: am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
efd617e01f8c22a69fa6d458883933f059e43491':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Thu, 5 Jan 2012 05:54:57 +0000 (21:54 -0800)]
am
7da207b5: am
a3534ad4: am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
7da207b574f1281792dcd7022467180d24438315':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Thu, 5 Jan 2012 05:54:55 +0000 (21:54 -0800)]
am
39f05540: am
875b6992: (-s ours) am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
39f05540988775fa44c5ca6a535bf329889b8720':
Do not allow file:// access when it is disabled. Do not merge.
Wink Saville [Thu, 5 Jan 2012 05:52:13 +0000 (21:52 -0800)]
am
3ed28036: am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
3ed2803691cc271fe6b893dc46d49fca2fce61df':
Enhancement on ICS data stall polling logic
Wink Saville [Thu, 5 Jan 2012 05:52:10 +0000 (21:52 -0800)]
am
0ad96f89: am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
0ad96f89401920486b68d8404f6a143870d57500':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Thu, 5 Jan 2012 05:52:06 +0000 (21:52 -0800)]
am
a3534ad4: am
c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit '
a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
Support suggestedRetryTime in CDMA DCT
Bart Sears [Thu, 5 Jan 2012 05:52:04 +0000 (21:52 -0800)]
am
875b6992: (-s ours) am
705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '
875b69928193e464243cf491bfe861f30644e9b4':
Do not allow file:// access when it is disabled. Do not merge.
Eric Laurent [Thu, 5 Jan 2012 01:47:37 +0000 (17:47 -0800)]
am
dc8627e7: resolved conflicts for merge of
1a4b9939 to master
* commit '
dc8627e7dcd019ec328878b1f7855890d39ed0ab':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)]
resolved conflicts for merge of
1a4b9939 to master
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
Alex Sakhartchouk [Thu, 5 Jan 2012 00:59:41 +0000 (16:59 -0800)]
Merge "Adding better error behavior to RS" into graphics-dev
Alex Sakhartchouk [Thu, 5 Jan 2012 00:59:16 +0000 (16:59 -0800)]
Merge "Adding RS comments, cleaning up the gl implementation with new Element hal." into graphics-dev
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:55:28 +0000 (13:55 -0800)]
am
c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '
c697ebfdd671c7f4cf338d601917de16d2f1f135':
Enhancement on ICS data stall polling logic
Wink Saville [Wed, 4 Jan 2012 21:53:25 +0000 (13:53 -0800)]
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:51:59 +0000 (13:51 -0800)]
am
d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '
d4d35168129d544f62cee7e1f83c5bf15d9f291d':
Add support of dislaying Alpha tag for BIP commands
Wink Saville [Wed, 4 Jan 2012 21:50:04 +0000 (13:50 -0800)]
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1