Narayan Kamath fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" ...

* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment

2015-02-24 10:18:39 +00:00

..

java

am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"

2015-02-24 10:18:39 +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 c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev

2015-02-24 00:46:48 +00:00

tests

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

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