tree 7ea9623115eedc0dc3d62701549558e94141795d
parent 5d6c1e3dbf1c71fe6974fda2b779c4aebc37917c
parent 39b79e79d3ad9e98a9c76c1b104599be494213f6
author Irfan Sheriff <isheriff@google.com> 1338489331 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338489331 -0700

am 39b79e79: am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev

* commit '39b79e79d3ad9e98a9c76c1b104599be494213f6':
  Fix walled garden detection on nakasi