commit eceede30f90f2c744782c626a3bd43a160d74382 Merge: bcb162b bfcebda Author: n8fr8 <nathan@freitas.net> Date: Sun Sep 30 18:14:54 2012 +0530 Merge branch 'datastats' res/layout/layout_main.xml | 48 +++++ res/values/strings.xml | 2 + src/org/torproject/android/Orbot.java | 193 +++++++++++++------- .../torproject/android/service/ITorService.aidl | 5 + .../android/service/ITorServiceCallback.aidl | 5 + src/org/torproject/android/service/TorService.java | 78 +++++++- .../android/service/TorServiceConstants.java | 2 + 7 files changed, 262 insertions(+), 71 deletions(-)