OSDN Git Service
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)
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."
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
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
5d0c713a: Reconcile with ics-mr1-release
* commit '
5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
Robert Ly [Fri, 20 Jan 2012 23:52:07 +0000 (15:52 -0800)]
am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
docs: wifi direct
Jim Miller [Fri, 20 Jan 2012 23:51:02 +0000 (15:51 -0800)]
am
d3fe9abf: am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
d3fe9abfb9a6a21a18abde6a98dceb423c04ebef':
Fix
5863053: Add method to lock screen immediately.
Jim Miller [Fri, 20 Jan 2012 23:48:21 +0000 (15:48 -0800)]
am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
ab9601cdbb95ae94088750eff9a926a572c1a4d6':
Fix
5863053: Add method to lock screen immediately.
Glenn Kasten [Fri, 20 Jan 2012 23:08:00 +0000 (15:08 -0800)]
am
865534a0: Merge "Fix warning for redundant typedef"
* commit '
865534a0e30982b0e669006509b9590fad129295':
Fix warning for redundant typedef
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Alex Sakhartchouk [Fri, 20 Jan 2012 23:05:22 +0000 (15:05 -0800)]
Merge "Refactoring out some params code." into graphics-dev
Glenn Kasten [Fri, 20 Jan 2012 22:52:03 +0000 (14:52 -0800)]
am
0a204ed0: Use audio_format_t consistently, continued
* commit '
0a204ed0f58a9baaac5630864cd75495486c6cbe':
Use audio_format_t consistently, continued
Robert Greenwalt [Fri, 20 Jan 2012 22:37:24 +0000 (14:37 -0800)]
am
2772143e: Merge "Stop using shared DUN APN when tethering stops."
* commit '
2772143eff6a69ae7182e0c2628809d8dbd8d355':
Stop using shared DUN APN when tethering stops.
Robert Greenwalt [Fri, 20 Jan 2012 22:35:41 +0000 (14:35 -0800)]
Merge "Stop using shared DUN APN when tethering stops."
Eino-Ville Talvala [Fri, 20 Jan 2012 22:35:16 +0000 (14:35 -0800)]
am
59734cb7: Merge "Add ANativeWindow timestamp support to camera service."
* commit '
59734cb7cae326d0c1f06de59ad1768cacaf7a6d':
Add ANativeWindow timestamp support to camera service.
Eino-Ville Talvala [Fri, 20 Jan 2012 22:32:22 +0000 (14:32 -0800)]
Merge "Add ANativeWindow timestamp support to camera service."
Robert Greenwalt [Fri, 20 Jan 2012 22:27:03 +0000 (14:27 -0800)]
am
67d853b6: Merge "Log netd traffic nicely."
* commit '
67d853b61a2d077d51545c480206b1873c74ea46':
Log netd traffic nicely.
Robert Greenwalt [Fri, 20 Jan 2012 22:24:15 +0000 (14:24 -0800)]
Merge "Log netd traffic nicely."
Alex Sakhartchouk [Fri, 20 Jan 2012 22:22:48 +0000 (14:22 -0800)]
Merge "Many optimizations of rendering path. Adding ability to split up per shader and per object updates. Added cubemaps as scenegraph objects." into graphics-dev
Jeff Brown [Fri, 20 Jan 2012 22:14:22 +0000 (14:14 -0800)]
am
1bf599a0: Merge "Initialize SQLite as part of the android runtime."
* commit '
1bf599a01e7ad720150d8cc12416ba67bebd74c9':
Initialize SQLite as part of the android runtime.
Gilles Debunne [Fri, 20 Jan 2012 22:14:19 +0000 (14:14 -0800)]
am
2f9510ca: Merge "Touch moves cursor in text refactored"
* commit '
2f9510ca50b0fd2925bc7e349f76136ed403a386':
Touch moves cursor in text refactored
Andreas Huber [Fri, 20 Jan 2012 22:14:15 +0000 (14:14 -0800)]
am
e8bb6fef: Merge "Starhub RTSP apparently does not establish time on all tracks"
* commit '
e8bb6fef58dfa94346d8a72c1eb9046d5d1f2da1':
Starhub RTSP apparently does not establish time on all tracks
Glenn Kasten [Fri, 20 Jan 2012 22:14:07 +0000 (14:14 -0800)]
am
c79e4139: Merge "Fix typos in string constants"
* commit '
c79e413911d48ebf14621304655029f6cd2c7959':
Fix typos in string constants
Glenn Kasten [Fri, 20 Jan 2012 22:14:04 +0000 (14:14 -0800)]
am
15f51cce: Merge "Remove dead file include/media/thread_init.h"
* commit '
15f51ccee1fb4aaf9296998e68156903f0657098':
Remove dead file include/media/thread_init.h
Glenn Kasten [Fri, 20 Jan 2012 22:14:02 +0000 (14:14 -0800)]
am
ea46649a: Merge "Remove redundant get()"
* commit '
ea46649a1cce7447ece812e60168f2bb3db47122':
Remove redundant get()
Glenn Kasten [Fri, 20 Jan 2012 22:13:41 +0000 (14:13 -0800)]
am
5ecff094: Merge "Move memcpy_to_i16_from_u8 to audio_utils"
* commit '
5ecff094f4df499f997bc9406c6e1a76a899aa12':
Move memcpy_to_i16_from_u8 to audio_utils
Jeff Brown [Fri, 20 Jan 2012 22:07:59 +0000 (14:07 -0800)]
Merge "Initialize SQLite as part of the android runtime."
Gilles Debunne [Fri, 20 Jan 2012 22:06:19 +0000 (14:06 -0800)]
Merge "Touch moves cursor in text refactored"
Andreas Huber [Fri, 20 Jan 2012 21:43:39 +0000 (13:43 -0800)]
Merge "Starhub RTSP apparently does not establish time on all tracks"
Glenn Kasten [Fri, 20 Jan 2012 20:16:06 +0000 (12:16 -0800)]
Merge "Fix typos in string constants"
Glenn Kasten [Fri, 20 Jan 2012 20:15:38 +0000 (12:15 -0800)]
Merge "Remove dead file include/media/thread_init.h"
Glenn Kasten [Fri, 20 Jan 2012 20:14:32 +0000 (12:14 -0800)]
Merge "Remove redundant get()"
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Gilles Debunne [Fri, 20 Jan 2012 18:28:56 +0000 (10:28 -0800)]
am
1d98303a: Merge "AOOB in AutoComplete"
* commit '
1d98303ab6141af57dc841115486d9795fc94d02':
AOOB in AutoComplete
Gilles Debunne [Fri, 20 Jan 2012 18:28:53 +0000 (10:28 -0800)]
am
7418c35d: Merge "Make sure text selection always starts"
* commit '
7418c35d80e3462fe6f80ed1394e2d31c8b1b6bf':
Make sure text selection always starts
Gilles Debunne [Fri, 20 Jan 2012 18:27:10 +0000 (10:27 -0800)]
Merge "AOOB in AutoComplete"
Gilles Debunne [Fri, 20 Jan 2012 18:27:00 +0000 (10:27 -0800)]
Merge "Make sure text selection always starts"
The Android Open Source Project [Fri, 20 Jan 2012 18:25:28 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
Glenn Kasten [Fri, 20 Jan 2012 18:09:09 +0000 (10:09 -0800)]
am
7524a592: Merge "Remove dead setRingerMode(mode, mask)"
* commit '
7524a592526a14d20ec3f3acffd61fe18afaa4b4':
Remove dead setRingerMode(mode, mask)
Glenn Kasten [Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)]
Merge "Remove dead setRingerMode(mode, mask)"
Glenn Kasten [Fri, 20 Jan 2012 16:34:40 +0000 (08:34 -0800)]
am
1b4d6049: Merge "Fix build warning for void * arithmetic"
* commit '
1b4d60497c6c89ae1457e802446c83ca7c8c0017':
Fix build warning for void * arithmetic
Glenn Kasten [Fri, 20 Jan 2012 16:32:45 +0000 (08:32 -0800)]
Merge "Fix build warning for void * arithmetic"
Pin Ting [Fri, 20 Jan 2012 09:39:40 +0000 (01:39 -0800)]
am
f17e7c27: Merge "Fixes some javadoc."
* commit '
f17e7c272e27671d12fbf676d209f0a77f1acda1':
Fixes some javadoc.
Pin Ting [Fri, 20 Jan 2012 09:37:12 +0000 (01:37 -0800)]
Merge "Fixes some javadoc."
Jeff Brown [Fri, 20 Jan 2012 03:55:58 +0000 (19:55 -0800)]
am
8592baa3: Merge "Don\'t need to link to libsqlite from media JNI library."
* commit '
8592baa347f5874b4f36713b6ca2edcedbb3f071':
Don't need to link to libsqlite from media JNI library.
Jeff Brown [Fri, 20 Jan 2012 03:55:55 +0000 (19:55 -0800)]
am
46deab0a: Merge "Clean up SQLiteDebug natives."
* commit '
46deab0a694e7e3c79980904706a4d09bbda001a':
Clean up SQLiteDebug natives.
Jeff Brown [Fri, 20 Jan 2012 03:55:52 +0000 (19:55 -0800)]
am
b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code."
* commit '
b815d0f80ae58bc48008186d3919e7c6e51fb43e':
Remove custom SQLITE_UNCLOSED error code.
Jeff Brown [Fri, 20 Jan 2012 03:54:16 +0000 (19:54 -0800)]
Merge "Don't need to link to libsqlite from media JNI library."
Jeff Brown [Fri, 20 Jan 2012 03:54:05 +0000 (19:54 -0800)]
Merge "Clean up SQLiteDebug natives."
Jeff Brown [Fri, 20 Jan 2012 03:53:38 +0000 (19:53 -0800)]
Merge "Remove custom SQLITE_UNCLOSED error code."
James Dong [Fri, 20 Jan 2012 02:55:06 +0000 (18:55 -0800)]
am
20c53cb3: Merge "Remove obsolete TODO comments"
* commit '
20c53cb3aa8489c11004ac718c0891273391ac8c':
Remove obsolete TODO comments
James Dong [Fri, 20 Jan 2012 02:53:27 +0000 (18:53 -0800)]
Merge "Remove obsolete TODO comments"
Romain Guy [Fri, 20 Jan 2012 02:36:34 +0000 (18:36 -0800)]
am
22d41843: Fix the build, for real
* commit '
22d418437e44587cb0fba4353515719453269189':
Fix the build, for real
Romain Guy [Fri, 20 Jan 2012 02:17:54 +0000 (18:17 -0800)]
Romain Guy [Fri, 20 Jan 2012 02:16:11 +0000 (18:16 -0800)]
Merge "Fix build"
Romain Guy [Fri, 20 Jan 2012 01:44:50 +0000 (17:44 -0800)]
am
d2f0dcd1: Merge "Remove unused code"
* commit '
d2f0dcd182fbc0423d206919e81f3845fb9b8155':
Remove unused code
Romain Guy [Fri, 20 Jan 2012 01:42:10 +0000 (17:42 -0800)]
Merge "Remove unused code"
Romain Guy [Fri, 20 Jan 2012 01:37:10 +0000 (17:37 -0800)]
am
bad12166: Merge "Deprecate unused APIs"
* commit '
bad12166190a7e8087eb5db0ae8df9a4e5843fde':
Deprecate unused APIs
Romain Guy [Fri, 20 Jan 2012 01:34:26 +0000 (17:34 -0800)]
Merge "Deprecate unused APIs"
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:34 +0000 (17:28 -0800)]
am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:30 +0000 (17:28 -0800)]
am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
12b7da69957ef894ce5134989e38479c64308ea1':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:26 +0000 (17:28 -0800)]
am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
f3f650db96d40014a0203393c585c368b0dd7a9a':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:22 +0000 (17:28 -0800)]
am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:28:18 +0000 (17:28 -0800)]
am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
7ae84204c14b4abff70fcc19c3c33de2591df34b':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:16 +0000 (17:26 -0800)]
am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:12 +0000 (17:26 -0800)]
am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:08 +0000 (17:26 -0800)]
am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:03 +0000 (17:26 -0800)]
am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:25:58 +0000 (17:25 -0800)]
am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:20:58 +0000 (17:20 -0800)]
am
97aa8ee8: Merge
ee4618bc
* commit '
97aa8ee81198234aedffceaf71ad216b96323393':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:18:25 +0000 (17:18 -0800)]
Merge
ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:02:27 +0000 (17:02 -0800)]
am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
36b48c30adf7236b00eccf87f3b5691359526540':
Rename (IF_)LOG() to (IF_)ALOG()
Jean-Baptiste Queru [Fri, 20 Jan 2012 00:59:41 +0000 (16:59 -0800)]
am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
The Android Automerger [Fri, 20 Jan 2012 00:28:56 +0000 (16:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 19 Jan 2012 23:44:53 +0000 (15:44 -0800)]
am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
820b45c0a21980a43532b9fb9823f8aa08c64a15':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Justin Ho [Thu, 19 Jan 2012 23:43:19 +0000 (15:43 -0800)]
Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:34 +0000 (14:47 -0800)]
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:22 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
OSDN Git Service
