Justin Ho
|
17aca35d84
|
am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
|
2012-02-10 10:13:19 -08:00 |
|
Justin Ho
|
69e91bd287
|
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
|
2012-02-10 10:10:39 -08:00 |
|
Justin Ho
|
f68eb20924
|
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
|
2012-02-10 10:09:42 -08:00 |
|
Justin Ho
|
b96058b1fa
|
Merge "Import translations. DO NOT MERGE" into ics-mr1
|
2012-02-10 10:07:07 -08:00 |
|
Scott Main
|
809b41a84e
|
am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit '98c313340a46401adda86b398a7623f39aa8e412':
|
2012-02-09 21:07:10 -08:00 |
|
Joe Fernandez
|
94f6cc4d39
|
am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
|
2012-02-09 21:07:08 -08:00 |
|
Scott Main
|
86cd9fa26a
|
am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit 'cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
|
2012-02-09 21:07:08 -08:00 |
|
Scott Main
|
68cda8cbaa
|
am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug 5125642
|
2012-02-09 16:04:15 -08:00 |
|
Scott Main
|
e1eb4ca887
|
am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug 5125642
|
2012-02-09 16:01:51 -08:00 |
|
Scott Main
|
8d35a8b077
|
am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug 5125642
|
2012-02-09 16:01:38 -08:00 |
|
Joe Fernandez
|
04398347b7
|
am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:48:46 -08:00 |
|
Joe Fernandez
|
976238bf5c
|
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:46:55 -08:00 |
|
Joe Fernandez
|
c4c313f8ca
|
am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
|
2012-02-09 13:46:41 -08:00 |
|
Joe Fernandez
|
8ec61aacd3
|
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
|
2012-02-09 13:45:01 -08:00 |
|
Scott Main
|
5cfc0b29db
|
am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:50:18 -08:00 |
|
Scott Main
|
40818f11a9
|
am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:48:18 -08:00 |
|
Scott Main
|
fbf4f0cf02
|
am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
|
2012-02-09 12:48:08 -08:00 |
|
Scott Main
|
abe3a692b0
|
am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
|
2012-02-07 21:50:20 -08:00 |
|
Scott Main
|
8d2d215ec3
|
am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
|
2012-02-07 21:49:37 -08:00 |
|
Scott Main
|
6301e33ebb
|
am 09ff04d7: docs: fix typo in menu TOC
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
|
2012-02-07 21:48:03 -08:00 |
|
Scott Main
|
aec806c78b
|
am 09ff04d7: docs: fix typo in menu TOC
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
|
2012-02-07 21:47:38 -08:00 |
|
The Android Open Source Project
|
652e8ffe13
|
am 1bd8111b: Reconcile with ics-mr1-release
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
|
2012-02-07 10:21:31 -08:00 |
|
The Android Open Source Project
|
9930f484d0
|
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
|
2012-02-07 10:18:32 -08:00 |
|
The Android Open Source Project
|
fe9a8650cc
|
am 07bebe8b: Reconcile with ics-mr1-release
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
|
2012-02-07 10:11:11 -08:00 |
|
The Android Open Source Project
|
9fd89364ab
|
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
|
2012-02-07 10:09:08 -08:00 |
|
John Wang
|
1dba562c36
|
am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
|
2012-02-06 17:04:42 -08:00 |
|
John Wang
|
35455a1f35
|
am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
|
2012-02-06 17:04:11 -08:00 |
|
John Wang
|
b4305fb3b2
|
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
|
2012-02-06 17:03:15 -08:00 |
|
John Wang
|
5e7679927c
|
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
|
2012-02-06 17:02:30 -08:00 |
|
John Wang
|
5245acf270
|
Merge "Don't use SNR in the invalid check." into ics-mr1
|
2012-02-06 17:00:49 -08:00 |
|
Xavier Ducrohet
|
b8c8ae7b70
|
am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
|
2012-02-06 16:45:21 -08:00 |
|
Xavier Ducrohet
|
e3ea59692a
|
am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
|
2012-02-06 16:44:32 -08:00 |
|
Xavier Ducrohet
|
d92740b76f
|
am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
|
2012-02-06 16:42:56 -08:00 |
|
Xavier Ducrohet
|
62898802ec
|
am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
|
2012-02-06 16:42:41 -08:00 |
|
Scott Main
|
3a0da645cb
|
am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit 'afaec57668551b797505f43d9d9677979dedf0c9':
|
2012-02-06 14:15:06 -08:00 |
|
Scott Main
|
f61b86a5f7
|
am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
|
2012-02-06 14:14:09 -08:00 |
|
Scott Main
|
435d5b6321
|
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
|
2012-02-06 14:12:39 -08:00 |
|
Jean-Baptiste Queru
|
b16e23ba94
|
am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
|
2012-02-06 14:12:05 -08:00 |
|
Scott Main
|
f20d8ee17f
|
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
|
2012-02-06 14:12:03 -08:00 |
|
Scott Main
|
3a00a8ad29
|
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
|
2012-02-06 14:10:16 -08:00 |
|
Jean-Baptiste Queru
|
eb7e2d29de
|
am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
|
2012-02-06 14:09:36 -08:00 |
|
Jean-Baptiste Queru
|
a6739d66f9
|
am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
|
2012-02-06 14:07:31 -08:00 |
|
Jean-Baptiste Queru
|
6ce7188266
|
Merge "Skia API changes as a result of an update to the Skia library."
|
2012-02-06 14:01:06 -08:00 |
|
Scott Main
|
52d55d8847
|
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
|
2012-02-06 13:07:24 -08:00 |
|
Scott Main
|
9f36e61a79
|
am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
* commit '8e399408724f3d18d48d13194e05a80108216fed':
docs: add Sony USB VID issue 5967572
|
2012-02-06 13:07:21 -08:00 |
|
Scott Main
|
fa585608f4
|
am 0654994b: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
* commit '0654994b9e546c50d84b3a9909f190220df65497':
docs: add Sony USB VID issue 5967572
|
2012-02-06 13:07:04 -08:00 |
|
Scott Main
|
e2a07c2902
|
am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue 5967572
|
2012-02-06 13:05:28 -08:00 |
|
Scott Main
|
d0b5f04467
|
am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue 5967572
|
2012-02-06 13:05:04 -08:00 |
|
Scott Main
|
5550262cc9
|
Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
|
2012-02-06 13:03:16 -08:00 |
|
Xavier Ducrohet
|
d424f2f502
|
am b54f371c: am f8aea993: Make aapt ignore tools-related data.
* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':
|
2012-02-06 11:44:19 -08:00 |
|