Andreas Gampe 5c1dc014ca Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev ...

am: 56177bf81b

Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f

2016-07-08 18:19:33 +00:00

..

java

Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev

2016-07-08 18:19:33 +00:00

jni

Merge changes from topic \'fifo\' into nyc-mr1-dev

2016-07-07 20:48:27 +00:00

res

Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev

2016-07-08 14:44:53 +00:00

tests

Merge \"Update DisplayMetrics when resizing\" into nyc-dev

2016-06-24 23:42:34 +00:00