tree e2257a427566e3b167660b0c6e31aee4dc4d73bc
parent 3d4fbf40115389ed33487db2059048163c9afd1a
parent a7a6a3a5efaf62cdd5d562a9141678671952d27d
author John Hoford <hoford@google.com> 1369324435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369324435 -0700

am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
  Fix issues with Local