Daniel Sandler 0988fb3ff1 am 0128c250: am 1b15acf7: Merge change I21eb4b87 into eclair-mr2 ...

Merge commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef'

* commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
  Allow room for descenders in am/pm text.

2009-12-07 18:35:36 -08:00

..

assets

Fix the youtube placeholder.

2009-10-12 12:52:33 -04:00

res

am 0128c250: am 1b15acf7: Merge change I21eb4b87 into eclair-mr2

2009-12-07 18:35:36 -08:00

Android.mk

Explicitly specify that online-sdk depends on framework-res. (do not merge)

2009-11-04 16:04:26 -08:00

AndroidManifest.xml

am 5886050f: Merge change I0d8f7593 into eclair

2009-12-02 05:26:12 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…