Merge "Merge Conflict resolved. [elm_conform]: review comments fixed for popup change...
authorshilpa onkar singh <shilpa.singh@samsung.com>
Fri, 18 Feb 2011 11:58:44 +0000 (20:58 +0900)
committerGerrit Code Review <git@Taebaek>
Fri, 18 Feb 2011 11:58:44 +0000 (20:58 +0900)
commitce146f111e57a831ea934aa88d39391c2c84e2a0
tree30aa2b3892c5ffeda212b2a76065edcb6212daae
parentf136b921a8684b9f3c5a0e954885abaf121f7500
parentef8d53f1c81b60f609d936bb9d058c6a431b0cf8
Merge "Merge Conflict resolved. [elm_conform]: review comments fixed for popup changes Change-Id: I4382344ddf16e05250472fb0700c7db4b6e5d5b7"