[automerger skipped] Merge "Add new reminder in "Magnify with shortcut" page"...
[automerger skipped] Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev am: 6bfc3811
am: 8c17c2f5 -s ours
am skip reason: change_id Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6 with SHA1 c375bfde is in history
Change-Id: I59d411384dcb192d2c026f3787e413463cd24d1a