tree 2eb4c424cdfc3c5a8d2118786791279a9f193cb4
parent bf5c49c6ab307f7f610eeabdf2b559a935ddbd6a
parent 6f3239dc4e1e47777791babb92352f69add9ffe7
author Conley Owens <cco3@android.com> 1392232991 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392232991 +0000

am 6f3239dc: am 0547da63: am 47bc9e90: am 0417b555: am d10c309f: am 39651168: Merge "Add sha-1 for repo launcher 1.20"

* commit '6f3239dc4e1e47777791babb92352f69add9ffe7':