Vladislav Kaznacheev dfa44e75d5 am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev ...

* commit 'a31cda89957cc1f29ae1b97a7fadf0266b7ae7b1':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."

2015-06-15 20:07:41 +00:00

..

java

am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

2015-06-15 20:07:41 +00:00

jni

am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev

2015-06-11 22:43:32 +00:00

res

Import translations. DO NOT MERGE

2015-06-15 09:14:54 -07:00

tests

Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev

2015-06-12 19:28:54 +00:00