Commit Graph

41739 Commits

Author SHA1 Message Date
Dianne Hackborn
0877ec44ac 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
2012-01-24 11:37:02 -08:00
Dianne Hackborn
a4a2df7f69 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
2012-01-24 11:34:49 -08:00
Daniel Sandler
9fb2e44d12 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.
2012-01-24 11:34:47 -08:00
Dianne Hackborn
8ee6be57f1 Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-24 11:33:15 -08:00
Dianne Hackborn
0545e6fcc8 Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 2012-01-24 11:33:06 -08:00
Daniel Sandler
244d1b2cad Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 2012-01-24 11:32:31 -08:00
Scott Main
67f1d5891e am 4809f09f: docs: update fujitsu id, capitalize
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
  docs: update fujitsu id, capitalize
2012-01-24 11:01:49 -08:00
Scott Main
dac2f15d6a am cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
  docs: add fujitsu/toshiba USB vendor id
2012-01-24 10:59:23 -08:00
Jean-Baptiste Queru
86391d8791 Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
7c21224b8c am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:43:14 -08:00
Jean-Baptiste Queru
c8c4c9b2c8 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:40:50 -08:00
Jean-Baptiste Queru
e5fb848d1f Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -08:00
Jim Miller
5f7ea7c272 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"
2012-01-23 15:51:23 -08:00
Jim Miller
666b06d8f4 Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1 2012-01-23 15:49:32 -08:00
Justin Ho
7ef6ae3b9b 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)"
2012-01-23 15:13:19 -08:00
Justin Ho
7ebc940ec5 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
Bill Gruber
3f92dbe932 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
2012-01-23 10:23:10 -08:00
Bill Gruber
9432e6bfea Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
3b79d1b26e Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
2012-01-23 10:15:41 -08:00
The Android Automerger
38418c2478 merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:12:47 -08:00
Jim Miller
b618fe6b34 am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337':
  Fix 5797764: Increase lock screen's thread priority
2012-01-20 15:26:42 -08:00
Jim Miller
27e1118292 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Justin Ho
f22a3b9825 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
2012-01-20 14:50:30 -08:00
Justin Ho
4989420b27 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Daniel Sandler
aa6598472a am 639ed754: Hide mobile RSSI on devices without mobile data.
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
  Hide mobile RSSI on devices without mobile data.
2012-01-20 14:40:26 -08:00
Justin Ho
d814b614ef am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
  New out-of-service RSSI.
2012-01-20 14:35:09 -08:00
Justin Ho
849c08b732 Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -08:00
Dianne Hackborn
98bd6e7708 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
2012-01-20 12:03:47 -08:00
Dianne Hackborn
e2b2ee959a Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 2012-01-20 12:01:51 -08:00
Daniel Sandler
798f073a62 am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
  Always show appropriate mobile service label.
2012-01-20 11:31:10 -08:00
Daniel Sandler
cec0a8e6a4 Merge "Always show appropriate mobile service label." into ics-mr1 2012-01-20 11:28:44 -08:00
Jeff Brown
c15791f7c7 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)
2012-01-20 11:26:46 -08:00
Jeff Brown
33700dff16 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)
2012-01-20 11:26:43 -08:00
Jeff Brown
2c0b7fbafa Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 2012-01-20 11:24:13 -08:00
Jeff Brown
0428b94c03 Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 2012-01-20 11:24:01 -08:00
The Android Open Source Project
ccbb697798 Reconcile with ics-mr1-release
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
2012-01-20 10:25:28 -08:00
Jean-Baptiste Queru
2f6bc1c106 am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
  Rename LOG_ASSERT to ALOG_ASSERT
2012-01-19 17:28:34 -08:00
Jean-Baptiste Queru
64efe6e47a am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
1f7552fadf am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
d3ed2f2e33 am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
9cb49d5854 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
364cc01b24 am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT
2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
1d151e1aba am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
29964df372 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
381857ed67 am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
1d99080434 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:25:58 -08:00
Jean-Baptiste Queru
fa73dc2e69 am 97aa8ee8: Merge ee4618bc
* commit '97aa8ee81198234aedffceaf71ad216b96323393':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
2012-01-19 17:20:58 -08:00
Jean-Baptiste Queru
0190e4d0b1 Merge ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
2012-01-19 17:18:25 -08:00
Jean-Baptiste Queru
949cbfce8c am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
2012-01-19 17:02:27 -08:00
Jean-Baptiste Queru
88c42cf13b am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
  Rename (IF_)LOG() to (IF_)ALOG()
2012-01-19 16:59:41 -08:00