tree 91377a4034a3f5eb688c1b9b0d92bb9ef258cd4d
parent 29498430029f5a4925e37db4abbf8b6fde4d6f4d
parent 965f39190cb50d97b98d47ba8ca205661cfa2c3d
author Christopher Ferris <cferris@google.com> 1400629200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400629200 +0000

am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
  Fix extra/missing : in path setup.