OSDN Git Service
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"
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
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
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
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
Jim Miller [Fri, 20 Jan 2012 23:26:42 +0000 (15:26 -0800)]
am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
eaa11a723150f1ea79446d7ba4bf77eb47b73337':
Fix
5797764: Increase lock screen's thread priority
Jim Miller [Fri, 20 Jan 2012 23:24:20 +0000 (15:24 -0800)]
Merge "Fix
5797764: Increase lock screen's thread priority" into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:50:30 +0000 (14:50 -0800)]
am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
b09f6f96e3583da320b69486869bc98fd463735e':
Update WiMAX assets to match new style Bug:
5724605
Justin Ho [Fri, 20 Jan 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
Daniel Sandler [Fri, 20 Jan 2012 22:40:26 +0000 (14:40 -0800)]
am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
639ed754bba866d2a47ef7ca58e56806b546b149':
Hide mobile RSSI on devices without mobile data.
Justin Ho [Fri, 20 Jan 2012 22:35:09 +0000 (14:35 -0800)]
am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
70e21c927afeff05d8f26e9df2f36785ca19fdfd':
New out-of-service RSSI.
Justin Ho [Fri, 20 Jan 2012 22:33:07 +0000 (14:33 -0800)]
Merge "New out-of-service RSSI." into ics-mr1
Dianne Hackborn [Fri, 20 Jan 2012 20:03:47 +0000 (12:03 -0800)]
am
1bae8066: Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
* commit '
1bae80668cc1d12bb4a4b93bce1960b2601de131':
Fix issue #
5823276 again: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 20 Jan 2012 20:01:51 +0000 (12:01 -0800)]
Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
Daniel Sandler [Fri, 20 Jan 2012 19:31:10 +0000 (11:31 -0800)]
am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
Daniel Sandler [Fri, 20 Jan 2012 19:28:44 +0000 (11:28 -0800)]
Merge "Always show appropriate mobile service label." into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:26:46 +0000 (11:26 -0800)]
am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:26:43 +0000 (11:26 -0800)]
am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
5d58eb06bcc8671bae72fb2389a9929e106131cc':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
Jeff Brown [Fri, 20 Jan 2012 19:24:13 +0000 (11:24 -0800)]
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
The Android Open Source Project [Fri, 20 Jan 2012 18:25:28 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
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)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:47:09 +0000 (14:47 -0800)]
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:54 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:39 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:46:24 +0000 (14:46 -0800)]
Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"
Steve Block [Mon, 9 Jan 2012 18:35:44 +0000 (18:35 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
Jean-Baptiste Queru [Thu, 19 Jan 2012 22:41:56 +0000 (14:41 -0800)]
Merge "Rename (IF_)LOG() to (IF_)ALOG()"
Robert Ly [Thu, 19 Jan 2012 21:32:51 +0000 (13:32 -0800)]
am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
4e552533ea049970b54c1cdba5afb7d13496c3c1':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
Robert Ly [Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)]
resolved conflicts for merge of
b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
Robert Ly [Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)]
am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
12310ee801553e63091ce3bda6f07a5be31a473c':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Thu, 19 Jan 2012 00:46:12 +0000 (16:46 -0800)]
am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
230a709285abc5dfd92f05d91a8997d52a59d3c7':
Fix
5863053: Add method to lock screen immediately.
Jim Miller [Thu, 19 Jan 2012 00:44:52 +0000 (16:44 -0800)]
Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
Eric Laurent [Thu, 19 Jan 2012 00:08:06 +0000 (16:08 -0800)]
am
db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit '
db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
Wink Saville [Thu, 19 Jan 2012 00:05:43 +0000 (16:05 -0800)]
am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Eric Laurent [Thu, 19 Jan 2012 00:05:31 +0000 (16:05 -0800)]
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Adam Powell [Wed, 18 Jan 2012 22:49:30 +0000 (14:49 -0800)]
am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:19:52 +0000 (13:19 -0800)]
am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:19:50 +0000 (13:19 -0800)]
am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Joe Fernandez [Wed, 18 Jan 2012 20:35:30 +0000 (12:35 -0800)]
am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Steve Block [Wed, 12 Oct 2011 16:27:03 +0000 (17:27 +0100)]
Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
Scott Main [Sat, 14 Jan 2012 02:25:44 +0000 (18:25 -0800)]
am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:35 +0000 (18:23 -0800)]
am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:23:34 +0000 (18:23 -0800)]
am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:23:33 +0000 (18:23 -0800)]
am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:18:17 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kenny Root [Fri, 13 Jan 2012 21:12:34 +0000 (13:12 -0800)]
am
2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '
2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 20:58:45 +0000 (12:58 -0800)]
am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:35:07 +0000 (12:35 -0800)]
am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 20:08:09 +0000 (12:08 -0800)]
am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:39:03 +0000 (11:39 -0800)]
am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Robert Ly [Fri, 13 Jan 2012 19:09:27 +0000 (11:09 -0800)]
am
62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '
62472581c30a3202b7bbd86e644b4346d5a4e65c':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
OSDN Git Service
