Todd Volkert fddd7ead7c Merge "Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it.""

2015-02-12 23:11:15 +00:00

..

java

Merge "Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it.""

2015-02-12 23:11:15 +00:00

jni

Merge "Intern strings used in Sensor information."

2015-02-12 20:30:07 +00:00

res

Merge "resolve merge conflicts of 6d8886a to master."

2015-02-12 19:27:34 +00:00

tests

am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 20:47:31 +00:00