tree d737e45ae47af20df73e119dadde0cd1736dc58d
parent 64f3777819975d52f5fc79dfc9b3f1d0683ffbef
parent 744fa997da07350c3b55330b34b6a975f72609b7
author Jerome Gaillard <jgaillard@google.com> 1429899527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429899527 +0000

am 744fa997: am 8e0d3400: Merge "Adds renaming in the theme selector of the Theme Editor" into studio-1.3-dev automerge: df6dd83 automerge: fa79622

* commit '744fa997da07350c3b55330b34b6a975f72609b7':
  Adds renaming in the theme selector of the Theme Editor