tree d737e45ae47af20df73e119dadde0cd1736dc58d
parent 192926e2fd97effa284dcf67379b23517e3cfeae
parent aa22e26a489af87b0175b38c4f7de963130f3102
author Jerome Gaillard <jgaillard@google.com> 1429900520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429900520 +0000

am aa22e26a: 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 'aa22e26a489af87b0175b38c4f7de963130f3102':
  Adds renaming in the theme selector of the Theme Editor