Andreas Gampe 305b44b948 am f29be77f: am a4f39ed9: am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime" ...

* commit 'f29be77f07084e88ae7104a375a1a54fd91de0dd':
  Frameworks/base: Pass variant and feature-set to runtime

2015-04-04 05:02:27 +00:00

..

java

Merge "Zen: Changes to support new automation settings sub-section."

2015-04-03 23:53:07 +00:00

jni

am f29be77f: am a4f39ed9: am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"

2015-04-04 05:02:27 +00:00

res

Merge "Documents the ImageView.ScaleType attributes"

2015-04-03 23:35:40 +00:00

tests

resolved conflicts for merge of 261e7a37 to master

2015-04-01 18:23:27 -07:00