tree 3e90d2fb0ca5ca3b84f43e4bdd6d1cba8b7db58b
parent b37d996fa90b1b98ea4aee75a696d9722c535619
parent d6145d21419680b22a6daa6da95ee566bef72df6
author John Hoford <hoford@google.com> 1369324474 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369324474 -0700

am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
  Fix issues with Local