Merge "remove some menu of Reset settings if emulator patchset2. add one menu" into...
authorHyejin Kim <hyejin0906.kim@tizendev.org>
Fri, 7 Sep 2012 05:46:24 +0000 (14:46 +0900)
committerGerrit Code Review <gerrit2@localhost>
Fri, 7 Sep 2012 05:46:24 +0000 (14:46 +0900)

Trivial merge