Merge "[Popup] Upstream merging r69492"
authorRajeev Ranjan <rajeev.r@samsung.com>
Tue, 20 Mar 2012 09:29:55 +0000 (18:29 +0900)
committerGerrit Code Review <gerrit2@localhost>
Tue, 20 Mar 2012 09:29:55 +0000 (18:29 +0900)

Trivial merge