OSDN Git Service
Fabrice Di Meglio [Tue, 24 Jan 2012 03:01:38 +0000 (19:01 -0800)]
am
50aca29a: Merge "Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
* commit '
50aca29a0b00c3f8f09b0c246da022df482ca56d':
Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after"
Fabrice Di Meglio [Tue, 24 Jan 2012 02:59:17 +0000 (18:59 -0800)]
Merge "Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
Chia-chi Yeh [Tue, 24 Jan 2012 02:42:55 +0000 (18:42 -0800)]
am
bbca2cef: Merge "VpnDialogs: fix screen flickering when popping up dialogs."
* commit '
bbca2ceffaa317bab0009e7c556ee4295101ea48':
VpnDialogs: fix screen flickering when popping up dialogs.
Chia-chi Yeh [Tue, 24 Jan 2012 02:40:52 +0000 (18:40 -0800)]
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
Jeff Brown [Tue, 24 Jan 2012 01:38:14 +0000 (17:38 -0800)]
am
d4e34d61: Merge "Inform ContentObservers about the changed content Uri."
* commit '
d4e34d61d01222ff90684b9a1dc4f9c8be560e7c':
Inform ContentObservers about the changed content Uri.
Jeff Brown [Tue, 24 Jan 2012 01:38:11 +0000 (17:38 -0800)]
am
b934a821: Merge "Clean up content observer code."
* commit '
b934a82139d555c40638226852390d53bb611cd7':
Clean up content observer code.
Jeff Brown [Tue, 24 Jan 2012 01:36:06 +0000 (17:36 -0800)]
Merge "Inform ContentObservers about the changed content Uri."
Jeff Brown [Tue, 24 Jan 2012 01:35:50 +0000 (17:35 -0800)]
Merge "Clean up content observer code."
Romain Guy [Tue, 24 Jan 2012 01:12:28 +0000 (17:12 -0800)]
am
1a54368b: Merge "Add full support for Canvas.setDrawFilter()"
* commit '
1a54368b24a8cb88ee56ee746eae45171a43b89e':
Add full support for Canvas.setDrawFilter()
Romain Guy [Tue, 24 Jan 2012 01:10:42 +0000 (17:10 -0800)]
Merge "Add full support for Canvas.setDrawFilter()"
Romain Guy [Tue, 24 Jan 2012 00:30:32 +0000 (16:30 -0800)]
am
e575005f: Merge "Update hardware acceleration doc"
* commit '
e575005f7c7a2ec26662862631ca1d0d1959d6bc':
Update hardware acceleration doc
Romain Guy [Tue, 24 Jan 2012 00:27:50 +0000 (16:27 -0800)]
Merge "Update hardware acceleration doc"
Jim Miller [Mon, 23 Jan 2012 23:55:18 +0000 (15:55 -0800)]
am
eda775cc: am
9f080e2a: am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
eda775cc89b862e0637af132d78168e1b28820f8':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:53:17 +0000 (15:53 -0800)]
am
9f080e2a: am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
9f080e2a5bc6a268934e32201c69ea8a86900396':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:51:23 +0000 (15:51 -0800)]
am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
44760b106a4bafcf83fb356bf91683db40e0e5a2':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:49:32 +0000 (15:49 -0800)]
Merge "Revert "Fix
5797764: Increase lock screen's thread priority"" into ics-mr1
Fabrice Di Meglio [Mon, 23 Jan 2012 23:49:06 +0000 (15:49 -0800)]
am
22cfd047: Merge "Fix bug #
5846413 "phone" keyboard layout is broken on master"
* commit '
22cfd047abb09929331ce2727499a24bcbb3604b':
Fix bug #
5846413 "phone" keyboard layout is broken on master
Fabrice Di Meglio [Mon, 23 Jan 2012 23:46:58 +0000 (15:46 -0800)]
Merge "Fix bug #
5846413 "phone" keyboard layout is broken on master"
Romain Guy [Mon, 23 Jan 2012 23:37:17 +0000 (15:37 -0800)]
am
d215ddf3: Merge "Fix API typo"
* commit '
d215ddf3d95b0d009ea7fc50c0d36647ebaa1c14':
Fix API typo
Romain Guy [Mon, 23 Jan 2012 23:35:24 +0000 (15:35 -0800)]
Merge "Fix API typo"
Justin Ho [Mon, 23 Jan 2012 23:18:41 +0000 (15:18 -0800)]
am
5d76def6: am
feb1d988: (-s ours) am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
5d76def68d135a4a0cf0a99a0fba7dad3e28c51a':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:16:00 +0000 (15:16 -0800)]
am
feb1d988: (-s ours) am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:13:19 +0000 (15:13 -0800)]
am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:11:00 +0000 (15:11 -0800)]
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
John Reck [Mon, 23 Jan 2012 23:05:57 +0000 (15:05 -0800)]
am
bc932579: Merge "Fix crash when scrolling a layer"
* commit '
bc932579ea35c6274c5a94c683c665a4d5bb3567':
Fix crash when scrolling a layer
John Reck [Mon, 23 Jan 2012 23:04:13 +0000 (15:04 -0800)]
Merge "Fix crash when scrolling a layer"
Dianne Hackborn [Mon, 23 Jan 2012 22:37:48 +0000 (14:37 -0800)]
am
fc585157: Merge "New screen rotation animation design."
* commit '
fc5851579ad316cffcacf231c5c04bda47b4517f':
New screen rotation animation design.
Dianne Hackborn [Mon, 23 Jan 2012 22:34:55 +0000 (14:34 -0800)]
Merge "New screen rotation animation design."
Gilles Debunne [Mon, 23 Jan 2012 22:13:22 +0000 (14:13 -0800)]
am
39092421: Merge "Double tap to select enabled on suggestions"
* commit '
3909242141d6735dbae96729716ccabaa9490fd5':
Double tap to select enabled on suggestions
Gilles Debunne [Mon, 23 Jan 2012 22:10:44 +0000 (14:10 -0800)]
Merge "Double tap to select enabled on suggestions"
Dianne Hackborn [Mon, 23 Jan 2012 20:37:36 +0000 (12:37 -0800)]
am
a6b8fe1c: Merge "New brightness setting to adjust auto-brightness mode."
* commit '
a6b8fe1c7115e0d3843cf6915f9a6f7598779530':
New brightness setting to adjust auto-brightness mode.
Dianne Hackborn [Mon, 23 Jan 2012 20:36:19 +0000 (12:36 -0800)]
Merge "New brightness setting to adjust auto-brightness mode."
Wink Saville [Mon, 23 Jan 2012 20:25:14 +0000 (12:25 -0800)]
am
5d6a095e: Merge "Do not clear good TLVs when a error occurs decoding."
* commit '
5d6a095e65bc64b0a7aaa5d66ba60713f2d88cce':
Do not clear good TLVs when a error occurs decoding.
Andy McFadden [Mon, 23 Jan 2012 20:22:50 +0000 (12:22 -0800)]
am
d71b9154: Merge "Don\'t use bootstrap loader directly"
* commit '
d71b9154daf796a03aebf2d38c60197cf77e0133':
Don't use bootstrap loader directly
Wink Saville [Mon, 23 Jan 2012 20:22:21 +0000 (12:22 -0800)]
Merge "Do not clear good TLVs when a error occurs decoding."
Andy McFadden [Mon, 23 Jan 2012 20:21:19 +0000 (12:21 -0800)]
Merge "Don't use bootstrap loader directly"
Bill Gruber [Mon, 23 Jan 2012 18:44:22 +0000 (10:44 -0800)]
am
cf5c78f2: am
add87f99: am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
cf5c78f209a34bae4a049ff2370252be8598d034':
DevDocs update: Publishing on Market
The Android Open Source Project [Mon, 23 Jan 2012 18:44:20 +0000 (10:44 -0800)]
am
8a6b2832: am
961b1df3: Reconcile with ics-mr1-release
* commit '
8a6b2832a954233e74617e1680829c4216ef2737':
Fix
5797764: Increase lock screen's thread priority
Bill Gruber [Mon, 23 Jan 2012 18:41:43 +0000 (10:41 -0800)]
am
add87f99: am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
add87f99d9ece26c776abe40297e9a49e08932d9':
DevDocs update: Publishing on Market
The Android Open Source Project [Mon, 23 Jan 2012 18:41:37 +0000 (10:41 -0800)]
am
961b1df3: Reconcile with ics-mr1-release
* commit '
961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
Fix
5797764: Increase lock screen's thread priority
Bill Gruber [Mon, 23 Jan 2012 18:23:10 +0000 (10:23 -0800)]
am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
5e5b57aef29b33d03965b4dc370cde9a39220adc':
DevDocs update: Publishing on Market
Bill Gruber [Mon, 23 Jan 2012 18:21:16 +0000 (10:21 -0800)]
Merge "DevDocs update: Publishing on Market" into ics-mr1
The Android Open Source Project [Mon, 23 Jan 2012 18:15:41 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
Andy McFadden [Mon, 23 Jan 2012 17:36:02 +0000 (09:36 -0800)]
am
30f1312b: Merge "Use Map.Entry, not HashMap.Entry"
* commit '
30f1312b3cb584c14eba60e6809d4eeed5d906bf':
Use Map.Entry, not HashMap.Entry
Andy McFadden [Mon, 23 Jan 2012 17:34:17 +0000 (09:34 -0800)]
Merge "Use Map.Entry, not HashMap.Entry"
Jim Miller [Mon, 23 Jan 2012 17:23:24 +0000 (09:23 -0800)]
am
8ffd2ccc: am
b1c7785c: am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
8ffd2cccf0f0458b941d2a3c69d30a6ae06fc33b':
Fix
5797764: Increase lock screen's thread priority
Justin Ho [Mon, 23 Jan 2012 17:23:21 +0000 (09:23 -0800)]
am
5691f6a8: am
e46f8696: am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
5691f6a882528a5a2b622eeed335d256d15a7f05':
Update WiMAX assets to match new style Bug:
5724605
Daniel Sandler [Mon, 23 Jan 2012 17:23:18 +0000 (09:23 -0800)]
am
e08c3e15: am
aaa7b772: am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
e08c3e152085193a3a87fe8373af1149904642b8':
Hide mobile RSSI on devices without mobile data.
Justin Ho [Mon, 23 Jan 2012 17:23:15 +0000 (09:23 -0800)]
am
9b4b3787: am
ffb0c0b3: am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
9b4b378777e00012449d904f342adc3be09437a7':
New out-of-service RSSI.
Jim Miller [Mon, 23 Jan 2012 17:18:36 +0000 (09:18 -0800)]
am
b1c7785c: am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
Fix
5797764: Increase lock screen's thread priority
Justin Ho [Mon, 23 Jan 2012 17:18:30 +0000 (09:18 -0800)]
am
e46f8696: am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
e46f869629ef27afb149c771e69dbbefe1135f33':
Update WiMAX assets to match new style Bug:
5724605
Daniel Sandler [Mon, 23 Jan 2012 17:18:24 +0000 (09:18 -0800)]
am
aaa7b772: am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
Hide mobile RSSI on devices without mobile data.
Justin Ho [Mon, 23 Jan 2012 17:18:20 +0000 (09:18 -0800)]
am
ffb0c0b3: am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
New out-of-service RSSI.
George Mount [Mon, 23 Jan 2012 15:32:27 +0000 (07:32 -0800)]
am
699ed800: Merge "Add cut and paste to ContentEditable."
* commit '
699ed8003877e14c72944461e5143e807e183558':
Add cut and paste to ContentEditable.
George Mount [Mon, 23 Jan 2012 15:30:26 +0000 (07:30 -0800)]
Merge "Add cut and paste to ContentEditable."
Michael Jurka [Mon, 23 Jan 2012 15:28:07 +0000 (07:28 -0800)]
am
5a89672f: Merge "Remove fastInvalidate and setFast* methods"
* commit '
5a89672f3ef0781f0c28e63ee774970340dbb4dd':
Remove fastInvalidate and setFast* methods
Michael Jurka [Mon, 23 Jan 2012 15:25:47 +0000 (07:25 -0800)]
am
5274d6f1: Merge "Improve rapid-fire presses on system bar"
* commit '
5274d6f115e8c3fda053a0fd4b4009ab15790191':
Improve rapid-fire presses on system bar
Michael Jurka [Mon, 23 Jan 2012 15:24:32 +0000 (07:24 -0800)]
Merge "Remove fastInvalidate and setFast* methods"
Michael Jurka [Mon, 23 Jan 2012 15:23:56 +0000 (07:23 -0800)]
Merge "Improve rapid-fire presses on system bar"
Dianne Hackborn [Sat, 21 Jan 2012 02:48:25 +0000 (18:48 -0800)]
am
02d37b97: resolved conflicts for merge of
892d11f4 to master
* commit '
02d37b9731eaf5d79f9eb395576e030934c37f3b':
Fix issue #
5823276 again: home repaints after full-screen app is exited
Dianne Hackborn [Sat, 21 Jan 2012 02:42:07 +0000 (18:42 -0800)]
resolved conflicts for merge of
892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
Christopher Tate [Sat, 21 Jan 2012 02:01:10 +0000 (18:01 -0800)]
am
65f87ec7: Merge "Fix shared-storage full backup"
* commit '
65f87ec733955455b66ea704e85709189b1cea80':
Fix shared-storage full backup
Christopher Tate [Sat, 21 Jan 2012 01:59:06 +0000 (17:59 -0800)]
Merge "Fix shared-storage full backup"
Glenn Kasten [Sat, 21 Jan 2012 01:19:13 +0000 (17:19 -0800)]
am
0f73d75d: Merge "Remove AudioFlinger dependencies on client"
* commit '
0f73d75da069e8af200092c0c6a8487108fdcbfb':
Remove AudioFlinger dependencies on client
Glenn Kasten [Sat, 21 Jan 2012 01:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
Guang Zhu [Sat, 21 Jan 2012 01:09:09 +0000 (17:09 -0800)]
am
7a640a09: Merge "Revert "Use port 18000 instead of 8000 for layout tests""
* commit '
7a640a093639c712ed4e37d06cb86c50d88bd376':
Revert "Use port 18000 instead of 8000 for layout tests"
Guang Zhu [Sat, 21 Jan 2012 01:06:42 +0000 (17:06 -0800)]
Merge "Revert "Use port 18000 instead of 8000 for layout tests""
Daniel Sandler [Sat, 21 Jan 2012 00:40:58 +0000 (16:40 -0800)]
am
e0e10b41: am
a64f899f: am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
e0e10b41c465a74749dcd1d05d8f4b688fcfdc3c':
Always show appropriate mobile service label.
Jeff Brown [Sat, 21 Jan 2012 00:40:55 +0000 (16:40 -0800)]
am
2af9ecfd: am
1bc82792: (-s ours) am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
2af9ecfd1eb25bcb05e1afbf09412d30cbc3fb42':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Sat, 21 Jan 2012 00:40:53 +0000 (16:40 -0800)]
am
8552b4a4: am
06a0fb95: (-s ours) am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
8552b4a4b7f08aabd0c66ceba91162b6f4997477':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
The Android Open Source Project [Sat, 21 Jan 2012 00:40:50 +0000 (16:40 -0800)]
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:40:48 +0000 (16:40 -0800)]
am
ba4ea763: am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ba4ea763b5284185348c592e421d4451054df909':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:40:45 +0000 (16:40 -0800)]
am
1e5b88fb: am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
1e5b88fb4fc52d44ededdb6b98fd7b8f7ee0a87d':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Daniel Sandler [Sat, 21 Jan 2012 00:38:24 +0000 (16:38 -0800)]
am
a64f899f: am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
a64f899fa6159a8839a769d3f107f6c502da58c8':
Always show appropriate mobile service label.
Jeff Brown [Sat, 21 Jan 2012 00:38:10 +0000 (16:38 -0800)]
am
1bc82792: (-s ours) am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Sat, 21 Jan 2012 00:38:07 +0000 (16:38 -0800)]
am
06a0fb95: (-s ours) am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
The Android Open Source Project [Sat, 21 Jan 2012 00:38:02 +0000 (16:38 -0800)]
am
288cde7f: Reconcile with ics-mr1-release
* commit '
288cde7f0a17f47f7071168f442d19f703947cc9':
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:52 +0000 (16:37 -0800)]
am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:13 +0000 (16:37 -0800)]
am
152e1736: am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
152e17367e1913df55d9953afaabfcfa41c33d01':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:34:59 +0000 (16:34 -0800)]
am
d4e936bf: am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
d4e936bf93b6405cc8b01fcda6569853d690bfc5':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:49 +0000 (16:32 -0800)]
am
20a34b52: am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
20a34b52ca377132645315098c87fea178fb23cf':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:31 +0000 (16:30 -0800)]
am
62a89549: am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
62a89549b7069bdda96f87d51fb60eb64b76f551':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:11 +0000 (16:28 -0800)]
am
da535e7c: am
fd266b36: (-s ours) am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
da535e7cf83d82e2b520eaccaae1d9eae54f63f2':
Rename (IF_)LOG() to (IF_)ALOG()
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:25:45 +0000 (16:25 -0800)]
am
fd266b36: (-s ours) am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
fd266b36826aa6dd8cd3fa00c159a094423899fb':
Rename (IF_)LOG() to (IF_)ALOG()
Justin Ho [Sat, 21 Jan 2012 00:24:55 +0000 (16:24 -0800)]
am
d1e83e4d: am
abc90a7b: (-s ours) am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
d1e83e4da8307fa4239a435fe3b74d0af2603635':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Justin Ho [Sat, 21 Jan 2012 00:23:03 +0000 (16:23 -0800)]
am
abc90a7b: (-s ours) am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
abc90a7b48b058379a50a426bd0d2769ac7229b6':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Jeff Brown [Sat, 21 Jan 2012 00:22:30 +0000 (16:22 -0800)]
am
8bef9cb6: Merge "Delete dead code."
* commit '
8bef9cb6b74769d173f7ae6eec83f027eda02986':
Delete dead code.
Jeff Brown [Sat, 21 Jan 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Delete dead code."
The Android Automerger [Sat, 21 Jan 2012 00:12:47 +0000 (16:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Fri, 20 Jan 2012 23:59:45 +0000 (15:59 -0800)]
am
18798131: Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
* commit '
18798131c611301a38e194deac91ff35278da9cc':
Additional logging information for Card Application Toolkit/SIM Toolkit
Wink Saville [Fri, 20 Jan 2012 23:56:56 +0000 (15:56 -0800)]
Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
Robert Ly [Fri, 20 Jan 2012 23:56:55 +0000 (15:56 -0800)]
am
96d58cf7: am
cdc1ea03: am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
96d58cf758c83f426f52259696ead4d6d9358072':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
The Android Open Source Project [Fri, 20 Jan 2012 23:56:52 +0000 (15:56 -0800)]
Robert Ly [Fri, 20 Jan 2012 23:56:44 +0000 (15:56 -0800)]
am
a551feef: am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
a551feefa57ea28146a2493778815f5402eb6e58':
docs: wifi direct
Robert Ly [Fri, 20 Jan 2012 23:52:32 +0000 (15:52 -0800)]
am
cdc1ea03: am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
OSDN Git Service
