The Android Open Source Project 72a6af1ab1 am 7d952644: merge from open-source master ...

Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled

2010-05-12 14:12:25 -07:00

..

assets

http://b/issue?id=2516676

2010-03-25 14:19:06 +00:00

res

am 7d952644: merge from open-source master

2010-05-12 14:12:25 -07:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

Bug 2673557: rename datamessaging

2010-05-10 19:12:49 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00