[tor-commits] [orbot/master] Merge pull request #131 from goapunk/master

[n8fr8 at torproject.org]

commit c425f5fb3446a32d2566dd21977b97535a3ea64d
Merge: eddcba62 285373d2
Author: Nathan Freitas <nathan at freitas.net>
Date:   Tue Mar 20 15:59:26 2018 -0400

    Merge pull request #131 from goapunk/master
    
    Revert "fix assets"

 BUILD                                | 4 ++++
 orbotservice/src/main/jni/Android.mk | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)