commit 758633c9e6471de28dcea1d63484e477a63555b7 Merge: 99dfdd7 c111030 Author: Amogh Pradeep amoghbl1@gmail.com Date: Thu May 29 05:02:08 2014 +0530

Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded

res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 2 ++ src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)