Chris Craik 6bcf223bf6 Merge "Revert "Add a way to override Xfermode""

2014-11-21 22:11:14 +00:00

..

java

Merge "Revert "Add a way to override Xfermode""

2014-11-21 22:11:14 +00:00

jni

Merge "Revert "Add a way to override Xfermode""

2014-11-21 22:11:14 +00:00

res

am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev

2014-11-21 18:25:13 +00:00

tests

am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev

2014-11-21 02:43:06 +00:00