Alan Viverette e166e0795e Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev am: a63d2db ...

am: 147baca

* commit '147baca4aa2f595ee1c2e8bb53b1aed43d3d7ddd':
  Fall back to setting the level of the entire progress drawable

Change-Id: If851161f3e26de46667006f2eb1522fd7c66fd37

2016-04-13 17:32:34 +00:00

..

java

Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev am: a63d2db

2016-04-13 17:32:34 +00:00

jni

resolve merge conflicts of 5ec9766 to nyc-dev-plus-aosp

2016-04-13 13:29:38 +00:00

res

Merge "Update display text in cert notification" into nyc-dev am: caf566a

2016-04-13 10:25:43 +00:00

tests

Merge "Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev am: 5dc3c67" into nyc-dev-plus-aosp

2016-04-12 22:42:11 +00:00