OSDN Git Service
Daniel Sandler [Wed, 25 Jan 2012 16:57:27 +0000 (08:57 -0800)]
am
416a1c1a: am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
Eric Laurent [Wed, 25 Jan 2012 16:57:23 +0000 (08:57 -0800)]
am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)]
am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Robert Greenwalt [Wed, 25 Jan 2012 16:54:59 +0000 (08:54 -0800)]
Merge "resolved conflicts for merge of
67cda1a0 to master"
George Mount [Wed, 25 Jan 2012 15:37:30 +0000 (07:37 -0800)]
Merge "Fix auto-complete for content-editable fields."
Mathias Agopian [Wed, 25 Jan 2012 03:22:08 +0000 (19:22 -0800)]
Merge changes Ib6b6da1d,I6d9a466a
* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
Mathias Agopian [Fri, 20 Jan 2012 02:34:40 +0000 (18:34 -0800)]
improve SurfaceFlinger dumpsys
It is now possible to say:
dumpsys SurfaceFlinger --latency
to print latency information about all windows
dumpsys SurfaceFlinger --latency window-name
to print the latency stats of the specified window
for instance: dumpsys SurfaceFlinger --latency SurfaceView
The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.
The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.
Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
Jim Miller [Wed, 25 Jan 2012 01:41:04 +0000 (17:41 -0800)]
Merge "Fix
5907237: dismiss keyguard after the camera app launches."
Svetoslav Ganov [Wed, 25 Jan 2012 01:02:23 +0000 (17:02 -0800)]
Merge "Fixing a typo in the NumberPicker documentation."
Fabrice Di Meglio [Wed, 25 Jan 2012 00:57:21 +0000 (16:57 -0800)]
Merge "Fix bug #
5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption"
Jean-Michel Trivi [Wed, 25 Jan 2012 00:23:22 +0000 (16:23 -0800)]
Merge "More AudioManager tests"
Winson Chung [Tue, 24 Jan 2012 23:51:53 +0000 (15:51 -0800)]
Merge "Call ActivityManager to get the proper icon dpi."
Jamie Gennis [Mon, 16 Jan 2012 02:54:57 +0000 (18:54 -0800)]
hack up frame latency measurement
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
Jeff Sharkey [Tue, 24 Jan 2012 23:38:54 +0000 (15:38 -0800)]
Merge "Match WIFI_P2P data usage."
Svetoslav Ganov [Tue, 24 Jan 2012 23:27:12 +0000 (15:27 -0800)]
Merge "NumberPicker should not throw an exception if no enough values for wrapping."
Robert Greenwalt [Tue, 24 Jan 2012 23:02:06 +0000 (15:02 -0800)]
resolved conflicts for merge of
67cda1a0 to master
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
Chris Craik [Tue, 24 Jan 2012 22:15:25 +0000 (14:15 -0800)]
Merge "Allow profiling of animation performance"
Adam Powell [Tue, 24 Jan 2012 21:58:41 +0000 (13:58 -0800)]
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
Svetoslav Ganov [Tue, 24 Jan 2012 21:57:05 +0000 (13:57 -0800)]
Merge "Removing unused imports and swiching off deprecated APIs"
Daniel Sandler [Tue, 24 Jan 2012 20:57:14 +0000 (12:57 -0800)]
am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
Stop showing "No internet connection" when there is one.
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:51:50 +0000 (11:51 -0800)]
am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)]
am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Jeff Sharkey [Tue, 24 Jan 2012 19:49:51 +0000 (11:49 -0800)]
Merge "Move network stats to FileRotator pattern."
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Robert Greenwalt [Tue, 24 Jan 2012 19:42:21 +0000 (11:42 -0800)]
am
f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit '
f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:39:49 +0000 (11:39 -0800)]
am
a5853595: am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
a5853595165a6395ca41bbc17a3dd88e12259ad1':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:37:24 +0000 (11:37 -0800)]
am
29cd79c7: am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
29cd79c7b0fecd2753fc27405794c0d5b5314302':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:37:21 +0000 (11:37 -0800)]
am
9dc211af: am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:37:02 +0000 (11:37 -0800)]
am
47163685: Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Tue, 24 Jan 2012 19:34:49 +0000 (11:34 -0800)]
am
c986d6f0: Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '
c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode
Daniel Sandler [Tue, 24 Jan 2012 19:34:47 +0000 (11:34 -0800)]
am
a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '
a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 19:32:31 +0000 (11:32 -0800)]
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:12:37 +0000 (11:12 -0800)]
Merge "Add new test for showing very slow animations."
Scott Main [Tue, 24 Jan 2012 19:05:02 +0000 (11:05 -0800)]
am
e7dc2898: am
4809f09f: docs: update fujitsu id, capitalize
* commit '
e7dc2898c099bb1673f4bb0074b4d3b697699176':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 19:02:25 +0000 (11:02 -0800)]
am
b790d1aa: am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
b790d1aa2f741813b1556b71875dc453bc8c8010':
docs: add fujitsu/toshiba USB vendor id
Scott Main [Tue, 24 Jan 2012 19:01:49 +0000 (11:01 -0800)]
am
4809f09f: docs: update fujitsu id, capitalize
* commit '
4809f09f55a6177bd69303630dc42cc738f71116':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 18:59:23 +0000 (10:59 -0800)]
am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
cdf14454326dcb2f43ae0da208a8ed65a38f2897':
docs: add fujitsu/toshiba USB vendor id
Gilles Debunne [Tue, 24 Jan 2012 18:46:58 +0000 (10:46 -0800)]
Merge "Fix for AOOB in MeasuredText"
Gilles Debunne [Tue, 24 Jan 2012 18:42:09 +0000 (10:42 -0800)]
Merge "Restored selectAllOnFocus"
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:46:26 +0000 (08:46 -0800)]
am
10c4641c: am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)]
am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)]
am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Adam Cohen [Tue, 24 Jan 2012 03:23:06 +0000 (19:23 -0800)]
Merge "Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter"
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:40:52 +0000 (18:40 -0800)]
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
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:10:42 +0000 (17:10 -0800)]
Merge "Add full support for Canvas.setDrawFilter()"
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: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:46:58 +0000 (15:46 -0800)]
Merge "Fix bug #
5846413 "phone" keyboard layout is broken on master"
Romain Guy [Mon, 23 Jan 2012 23:35:24 +0000 (15:35 -0800)]
Merge "Fix API typo"
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:04:13 +0000 (15:04 -0800)]
Merge "Fix crash when scrolling a layer"
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:10:44 +0000 (14:10 -0800)]
Merge "Double tap to select enabled on suggestions"
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: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: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:34:17 +0000 (09:34 -0800)]
Merge "Use Map.Entry, not HashMap.Entry"
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:30:26 +0000 (07:30 -0800)]
Merge "Add cut and paste to ContentEditable."
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:42:07 +0000 (18:42 -0800)]
resolved conflicts for merge of
892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
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:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
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: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: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: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: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: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: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: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