John Reck 570b2052bb DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev ...

Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1

2015-05-14 07:38:11 -07:00

..

java

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

jni

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

res

am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev

2015-04-30 20:01:02 +00:00

tests

am 4547dac0: Fix one-off error in reporting.

2015-04-28 18:28:18 +00:00