tree 9330e874ab9f72036b9bdde1dabf3c2652738168
parent 14124c696d82e68f93baed905ca01fc498ae1fc6
parent a83580614f4f75f7d474e81c7c10c2c784df1380
author Craig Mautner <cmautner@google.com> 1336587439 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336587439 -0700

Merge "Keep layout from overwriting translate dimensions" into jb-dev