tree d12b0047cd82424f0596c0c19221e034cee79582
parent 91bf3ccba0f5b8ba4daca37b83faa4de86bff737
parent e3b728db78e4f6a7533f93d70e9a513751b4a005
author Jens Ole Lauridsen <jlauridsen@google.com> 1434126591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434126591 +0000

am e3b728db: Merge "DesignTime: Do not use animation in design time." into lmp-mr1-ub-dev

* commit 'e3b728db78e4f6a7533f93d70e9a513751b4a005':
  DesignTime: Do not use animation in design time.