Alan Viverette e23ab83731 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev automerge: c4a12a7 ...

automerge: 36a132c

* commit '36a132c0a0adfd15b20c3e269d7647c050cd84aa':
  Format ListPreference summary with empty string if entry is null

2014-10-22 01:00:03 +00:00

..

java

am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev automerge: c4a12a7

2014-10-22 01:00:03 +00:00

jni

am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev

2014-10-21 23:34:46 +00:00

res

am ef2fef17: am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev

2014-10-21 18:43:50 +00:00

tests

am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-20 10:16:29 +00:00