Sid Soundararajan 7f26540426 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev ...

am: 0513125c92

* commit '0513125c92789912214235faad26e7a97184a53a':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I057727feb949fc864c3396ef53f9fba331f65ba8

2016-05-23 20:01:03 +00:00

..

java

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev

2016-05-23 19:50:36 +00:00

jni

DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

2016-05-17 18:02:32 +01:00

res

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev

2016-05-23 20:01:03 +00:00

tests

Merge "Fix parsing of kernel wakelocks" into nyc-dev

2016-05-20 17:23:08 +00:00