Dan Sandler 8d365fe440 am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev ...

* commit 'd1b160f362e4d2bd961d8091b438f8eeb7d61a2f':
  "I tried to think of the most harmless thing."

2015-08-16 03:02:19 +00:00

..

assets

…

res

am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 03:02:19 +00:00

Android.mk

…

AndroidManifest.xml

DO NOT MERGE Allow a custom component to handle network policy notifications

2015-08-11 15:36:06 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…