tree c74cd86bf0d537c9408f7d60ce6567239ca7ad8d
parent 7582bd09806f45bdd17be83466863d11ec36e205
parent ec45ea65458b1a0a3bee0a188c5b713ea0d2d093
author Elliott Hughes <enh@google.com> 1424377601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424377601 +0000

am ec45ea65: am 37e8ce55: Merge "Lose the version number from the directory name."

* commit 'ec45ea65458b1a0a3bee0a188c5b713ea0d2d093':
  Lose the version number from the directory name.