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

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

2014-10-22 00:39:27 +00:00

..

java

Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev

2014-10-22 00:35:29 +00:00

jni

Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev

2014-10-21 20:59:53 +00:00

res

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

2014-10-21 18:33:26 +00:00

tests

Add CHANGE_NETWORK_STATE permission to bt tests

2014-10-15 14:06:30 -07:00