Scott Main
bff0727132
am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
...
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 14:55:44 -08:00
Scott Main
237818dc58
am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
...
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
2011-12-14 14:53:40 -08:00
Scott Main
86899230f7
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
2011-12-14 14:53:04 -08:00
Scott Main
e74d5a1abc
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
2011-12-14 14:51:30 -08:00
Scott Main
aea7c25ec2
am fd24af66: am 691fea72: am 70645e36: Docs: Add class for Sharing Content
...
* commit 'fd24af6620ee346bfbbc29a62290f67141a79245':
Docs: Add class for Sharing Content
2011-12-14 14:45:46 -08:00
Scott Main
89d8bf771d
am 691fea72: am 70645e36: Docs: Add class for Sharing Content
...
* commit '691fea726dbefe2a7142b403bfc47f5c9029f61a':
Docs: Add class for Sharing Content
2011-12-14 14:42:57 -08:00
Scott Main
932651387c
am 70645e36: Docs: Add class for Sharing Content
...
* commit '70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
2011-12-14 14:40:19 -08:00
Brian Colonna
c2bcf36d0d
Merge "Added Face Unlock to tablet lockscreen layouts"
2011-12-14 14:14:24 -08:00
James Dong
39fc0a0805
am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
...
* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
2011-12-14 13:53:31 -08:00
James Dong
e6f21efc7b
am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
...
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
2011-12-14 13:50:08 -08:00
Fabrice Di Meglio
9f3cd71de8
Merge "Fix bug #5674155 Segmentation issue for Thai"
2011-12-14 13:47:00 -08:00
Irfan Sheriff
4fba479e31
Merge "Track scan count by UID"
2011-12-14 12:06:00 -08:00
Ji-Hwan Lee
c4cd5301d4
Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer
...
Currently, madvise(MADV_REMOVE) is called after deallocation.
Another thread might allocate (and even write) the same region between
deallocation and madvise(), in which case the new thread will fail to read
what it have written. So, call deallocate() after madvise(MADV_REMOVE).
Bug: 5654596
Change-Id: I26f36cd6013de499090768a0ddc68206a4a68219
2011-12-15 04:37:22 +09:00
Jeff Sharkey
b335110245
Merge "Avoid reading network stats when disabled."
2011-12-14 10:12:17 -08:00
Romain Guy
fd8fdfdc2f
Merge "Reduce the number of active texture changes"
2011-12-13 22:11:45 -08:00
The Android Open Source Project
03332a089f
am 16bdd1e6: Reconcile with ics-mr1-release
...
* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':
2011-12-13 19:13:18 -08:00
The Android Open Source Project
0ab2a4bebe
Reconcile with ics-mr1-release
...
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
2011-12-13 19:10:19 -08:00
Fabrice Di Meglio
fc9e209e62
Merge "Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B"
2011-12-13 18:43:04 -08:00
Romain Guy
d0d85bce20
Merge "<Insert something improper about OpenGL>"
2011-12-13 18:41:58 -08:00
Dirk Dougherty
5dfe8f2ba2
am 1451f598: am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
...
* commit '1451f598ae5da5b8f0e24b4714f7321c2e6f59f5':
Doc change: API diff report for 15.
2011-12-13 18:37:34 -08:00
Dirk Dougherty
09998b1bf1
am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
...
* commit '2e335cb02891d3653b938340a11698844e2c3d6d':
Doc change: API diff report for 15.
2011-12-13 18:35:10 -08:00
Dirk Dougherty
b2177213f0
Merge "Doc change: API diff report for 15." into ics-mr1
2011-12-13 18:33:04 -08:00
Romain Guy
bedf00f93e
Merge "Further reduce the number of GL commands sent to the driver"
2011-12-13 17:29:42 -08:00
Dianne Hackborn
cdc3ed2d11
resolved conflicts for merge of a80bab37 to master
...
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
2011-12-13 16:31:43 -08:00
The Android Automerger
cbe3d5bc7e
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 16:03:26 -08:00
Gilles Debunne
1aa8e025eb
am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
...
* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
Do not spell check the foreground ExtractEditText.
2011-12-13 15:59:26 -08:00
Dianne Hackborn
990f3c5fe9
am caa8e69a: Merge "Fix issue #5756204 : Crespo IME briefly appears shortened when..." into ics-mr1
...
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
Fix issue #5756204 : Crespo IME briefly appears shortened when...
2011-12-13 15:41:54 -08:00
Fabrice Di Meglio
8d758ae626
Merge "TextLayoutCache - fix diacritics composition"
2011-12-13 15:41:47 -08:00
Dianne Hackborn
1b90c5bd0d
Merge "Fix issue #5756204 : Crespo IME briefly appears shortened when..." into ics-mr1
2011-12-13 15:40:18 -08:00
Amith Yamasani
13ef99923d
Merge "Dump system and secure settings in bugreport."
2011-12-13 15:39:17 -08:00
Gilles Debunne
aed8f093a0
am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
...
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
Do not spell check the foreground ExtractEditText.
2011-12-13 15:38:43 -08:00
Gilles Debunne
8d0b3f3474
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
2011-12-13 15:36:48 -08:00
Chet Haase
9ddaf1f9f1
Merge "Make glyph cache more flexible"
2011-12-13 14:03:43 -08:00
Dianne Hackborn
a856aa2d45
am 0be53567: am 19a06fe9: Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
...
* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
Fix issue #5755172 : Soft menu key disappears when menu is open
2011-12-13 13:44:14 -08:00
Dianne Hackborn
8ec06aaf4a
am 19a06fe9: Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
...
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #5755172 : Soft menu key disappears when menu is open
2011-12-13 13:42:07 -08:00
Gilles Debunne
e46ccbba0d
am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
...
* commit '0d3a5e4cbddc9a6a0a551698b5152c815842952a':
NPE in GMail / TextLine
2011-12-13 13:42:07 -08:00
Gilles Debunne
75ce7098b3
am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
...
* commit '67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine
2011-12-13 13:40:00 -08:00
Dianne Hackborn
f3600e569a
Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
2011-12-13 13:38:56 -08:00
Gilles Debunne
366d1432ed
Merge "NPE in GMail / TextLine" into ics-mr1
2011-12-13 13:37:29 -08:00
Scott Main
c8e7b72d01
am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit '9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
Created Android University lesson for Multiple APKs.
2011-12-13 13:15:27 -08:00
Scott Main
88aeee3681
am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:15:25 -08:00
Romain Guy
18875aecc6
Merge "Reduce the number of GL commands generated by the UI"
2011-12-13 13:13:31 -08:00
Scott Main
d0f5b5ba80
am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.
2011-12-13 13:13:15 -08:00
Scott Main
95c8297d4f
am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:13:07 -08:00
Scott Main
db20a9b152
am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
2011-12-13 13:10:45 -08:00
Scott Main
568bf65826
am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:10:42 -08:00
Scott Main
f07b37cde6
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
2011-12-13 12:25:38 -08:00
Andreas Huber
c8644da8b6
am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
...
* commit '22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
2011-12-13 12:04:35 -08:00
Andreas Huber
a0c39d8bef
am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
...
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
2011-12-13 12:01:46 -08:00
Andreas Huber
3ef0a52028
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
2011-12-13 11:59:50 -08:00