tree 206f74fdef636039adf4000a49d6744c026bc172
parent 44a711ccac480aef4e8518284b8a0320e227f2df
parent df188d4137a9ebf0661127bab36c517a7fb001d5
author Alan Viverette <alanv@google.com> 1416941077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416941077 +0000

am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev

* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API