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 |
|
Xavier Ducrohet
|
0ada13c455
|
am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
Make aapt ignore tools-related data.
|
2012-02-06 11:42:50 -08:00 |
|
Xavier Ducrohet
|
987d161da4
|
am f8aea993: Make aapt ignore tools-related data.
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
|
2012-02-06 11:41:56 -08:00 |
|
Xavier Ducrohet
|
a001da3e59
|
am f8aea993: Make aapt ignore tools-related data.
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
|
2012-02-06 11:41:04 -08:00 |
|
Scott Main
|
370da72626
|
am 2adfc9de: am 633de7ba: docs: fix meta description tag for homepage
* commit '2adfc9de0390962701535d0c075c4fb8e886d9d8':
|
2012-02-01 15:56:56 -08:00 |
|
Scott Main
|
6309f2ad9b
|
am c78a300c: am 6aaa27fb: docs: fix broken link
* commit 'c78a300c6abfea859538f4148ddb3311ca06dd7e':
|
2012-02-01 15:56:55 -08:00 |
|
Scott Main
|
487d261e7e
|
am be09298e: am 633de7ba: docs: fix meta description tag for homepage
* commit 'be09298eb708f6acb6af7028fbca28afdf230008':
docs: fix meta description tag for homepage
|
2012-02-01 15:15:10 -08:00 |
|
Scott Main
|
a5b6218f47
|
am 633de7ba: docs: fix meta description tag for homepage
* commit '633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
|
2012-02-01 15:12:40 -08:00 |
|
Scott Main
|
a64887b7b7
|
am 633de7ba: docs: fix meta description tag for homepage
* commit '633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
|
2012-02-01 15:12:33 -08:00 |
|
Scott Main
|
4e2c486f8f
|
am fb16fdf2: am 6aaa27fb: docs: fix broken link
* commit 'fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
docs: fix broken link
|
2012-02-01 15:03:15 -08:00 |
|
Scott Main
|
40b414b7c8
|
am 6aaa27fb: docs: fix broken link
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
|
2012-02-01 15:00:49 -08:00 |
|
Scott Main
|
d27c50c6c1
|
am 6aaa27fb: docs: fix broken link
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
|
2012-02-01 15:00:30 -08:00 |
|
Scott Main
|
9f0d05b749
|
am b49c0355: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit 'b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
|
2012-02-01 13:54:48 -08:00 |
|
Scott Main
|
071b15dae2
|
am e043db89: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'e043db892436f643fc2d71df3bc4b2604c556988':
|
2012-02-01 13:54:45 -08:00 |
|
Scott Main
|
9a6aacb2a9
|
am 13f3c854: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '13f3c854d8fb635fa824a1ba15fe85152fed131e':
|
2012-02-01 13:54:43 -08:00 |
|
Xia Wang
|
3b1b659c99
|
am 581a3334: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '581a33344485181eb3484ba7bf50ff2b52be6d99':
|
2012-02-01 13:54:40 -08:00 |
|
Scott Main
|
5a6982701c
|
am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
|
2012-02-01 13:52:21 -08:00 |
|
Scott Main
|
9ecc68d43b
|
am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
|
2012-02-01 13:52:19 -08:00 |
|
Scott Main
|
29ccacfaec
|
am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
|
2012-02-01 13:52:17 -08:00 |
|
Xia Wang
|
7c2858ed4a
|
am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
|
2012-02-01 13:52:13 -08:00 |
|
Scott Main
|
a10be9c171
|
am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
docs: fix action bar style example
|
2012-02-01 11:58:57 -08:00 |
|
Scott Main
|
1ba2367924
|
am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
|
2012-02-01 11:56:23 -08:00 |
|
Scott Main
|
fa8e018073
|
Merge "docs: fix action bar style example" into ics-mr1
|
2012-02-01 11:54:57 -08:00 |
|
Scott Main
|
f492438d64
|
am b43a0f1f: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
docs: dashboard update for feb 1
|
2012-02-01 11:48:28 -08:00 |
|
Scott Main
|
cae4d0cdbc
|
am 9af875ec: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '9af875ec74e34541539897d7a8069b4ea7f07b12':
docs: update menu guide with CAB and popup menu, plus many other revisions
|
2012-02-01 11:48:26 -08:00 |
|
Scott Main
|
f61e776f87
|
am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
|
2012-02-01 11:45:51 -08:00 |
|