Narayan Kamath 907bcd96d7 am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server forking." ...

* commit '644ebc8800ad5e2fa1c239bd65a2cf6a88e6556b':
  Fix a couple of issues with system_server forking.

2015-02-19 10:30:46 +00:00

..

java

am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server forking."

2015-02-19 10:30:46 +00:00

jni

am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

2015-02-12 05:54:34 +00:00

res

am bdbd4736: Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev

2015-02-19 01:06:51 +00:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00