Alan Viverette 00a1fa3e43 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev ...

automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
  Invalidate SubtitleView during setText()

2015-02-05 23:00:44 +00:00

..

java

am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev

2015-02-05 23:00:44 +00:00

jni

am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

2015-01-27 23:02:57 +00:00

res

Move layer-list to be top-level element in seek bar progress automerge: bac8e12

2015-02-05 03:45:31 +00:00

tests

am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

2015-02-05 02:31:40 +00:00