Filip Gruszczyński d54530e9ce am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev ...

* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.

2014-03-06 00:30:17 +00:00

..

java

am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev

2014-03-06 00:30:17 +00:00

jni

am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

2014-03-05 19:29:40 +00:00

res

am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev

2014-03-06 00:30:17 +00:00

tests

Move Json{Reader,Writer} test to cts.

2014-02-17 17:51:43 +00:00