tree 4ce7c4275306f85531b61cbf348234ba2d537731
parent be1577ae599a4bd63bf8646a1f318dd9aabd4ae6
parent a9fbf3817acc3fba683b9b40d027c5b207df90e5
author TreeHugger Robot <treehugger-gerrit@google.com> 1499979579 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499979579 +0000

Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev