Adam Lesinski 7137ee38cb am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev ...

* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser

2014-09-10 00:17:53 +00:00

..

assets

…

res

am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev

2014-09-10 00:17:43 +00:00

Android.mk

…

AndroidManifest.xml

am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev

2014-09-10 00:17:53 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…