tree aabe752fde8393983e771a9391ff0f8022c0ce77
parent d40451f3d27758905d136adbb20441f4a32de059
parent 4d6f89052289bd7170238c8797b2ee19115b7626
author Andreas Huber <andih@google.com> 1364251750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1364251750 +0000

am 112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev

* commit '112c72a9655c0d2fa3a8058e2a6c3bef6adb6232':
  Get rid of TunnelRenderer