Merge "[multibuttonentry]merged with opensource (r69583) Change-Id: Iacb6749138e70493...
authorGoun Lee <gouni.lee@samsung.com>
Tue, 27 Mar 2012 02:10:55 +0000 (11:10 +0900)
committerGerrit Code Review <gerrit2@localhost>
Tue, 27 Mar 2012 02:10:55 +0000 (11:10 +0900)

Trivial merge