Bryce Lee a20e430d0a am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev ...

* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."

2015-02-06 19:42:38 +00:00

..

java

am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev

2015-02-06 19:42:38 +00:00

jni

am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

2015-01-27 23:02:57 +00:00

res

am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev

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

tests

am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

2015-02-05 02:31:40 +00:00