Dianne Hackborn 0641ebd723 am cb995121: Merge "Final (ha ha) API 14." ...

* commit 'cb995121ee4bb4da236e8181fbfbd33bc2f9173a':
  Final (ha ha) API 14.

2011-09-15 00:34:38 -07:00

..

assets

…

res

am cb995121: Merge "Final (ha ha) API 14."

2011-09-15 00:34:38 -07:00

Android.mk

…

AndroidManifest.xml

am 83f9dfe0: Merge "Add boot mode where only "core apps" are started."

2011-09-12 15:09:14 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…