Narayan Kamath 2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" ...

* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs

2014-04-10 09:47:21 +00:00

..

java

am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"

2014-04-10 09:47:21 +00:00

jni

resolved conflicts for merge of 286a247e to master

2014-04-10 10:38:31 +01:00

res

am 5062649a: Merge "Update list item text appearance"

2014-04-09 23:58:39 +00:00

tests

Merge "A stress test for concurent multidex extraction."

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