tree cfe2aee294d19e5dd4a18e01e7c9928b13e6119a
parent 53fd8e84c701048d4d30bb885656eab334a4e772
parent 75b1c3011be727acbc862d6684299709756a33bd
author Jean-Baptiste Queru <jbq@google.com> 1335301032 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335301032 -0700

am 75b1c301: am ed11920c: am 60247737: Merge "Fix build - re-generate current.txt"

* commit '75b1c3011be727acbc862d6684299709756a33bd':
  Fix build - re-generate current.txt