Adam Lesinski 6028e28986 Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp ...

am: 768542e38d

* commit '768542e38d356bd18cb567dacc89c504d128ccd4':
  Fix parsing of kernel wakelocks

Change-Id: Ic5b48697830e96528cd87a579f0ee8a5ab665bf9

2016-05-20 17:43:40 +00:00

..

apks

…

assets

…

certs

…

DisabledTestApp

…

EnabledTestApp

…

res

Hide children in ViewGroup.createSnaphost via internal flag and add test for

2016-03-30 14:20:09 -07:00

src

Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp

2016-05-20 17:43:40 +00:00

Android.mk

Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3

2016-03-31 10:55:46 -07:00

AndroidManifest.xml

Remove tests that have been moved to CTS

2016-04-06 17:47:10 -07:00