Alan Viverette 138e781717 am 52e313c1: Merge "Jump drawable state (including ripples) on view detach" into lmp-dev ...

* commit '52e313c14c5cf1d1a71fd491e64849c4b7b62970':
  Jump drawable state (including ripples) on view detach

2014-08-21 20:08:10 +00:00

..

java

Merge "Jump drawable state (including ripples) on view detach" into lmp-dev

2014-08-21 20:03:03 +00:00

jni

Merge "Add bounds checking to nine patch scaling" into lmp-dev

2014-08-21 00:16:54 +00:00

res

am ce5a9143: Merge "Update material switch styling" into lmp-dev

2014-08-21 20:08:04 +00:00

tests

follow up minor fixes for connectivity manager test

2014-08-20 17:40:18 -07:00