George Mount 37ff6f6402 Merge "Reset transitionAlpha when the transition is stopped early."

2015-04-06 14:22:46 +00:00

..

java

Merge "Reset transitionAlpha when the transition is stopped early."

2015-04-06 14:22:46 +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

Import translations. DO NOT MERGE

2015-04-06 07:16:49 -07:00

tests

resolved conflicts for merge of 261e7a37 to master

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