Amith Yamasani 792e41fe2a am 8f993de8: Merge "Expose an API to generate a badged icon for managed profiles." ...

* commit '8f993de81f9e9bcfd136c42bb6bf12114fedfd36':
  Expose an API to generate a badged icon for managed profiles.

2014-04-11 22:04:41 +00:00

..

java

am 8f993de8: Merge "Expose an API to generate a badged icon for managed profiles."

2014-04-11 22:04:41 +00:00

jni

Merge "Simplify matrix calculations"

2014-04-11 20:14:46 +00:00

res

am d951ab23: am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

2014-04-11 19:44:01 +00:00

tests

Merge "A stress test for concurent multidex extraction."

2014-04-09 09:49:58 +00:00