tree 8a8fc75747a5cf7df5c11ff1600baf6a2c6059af
parent 6f6058099edd6b4b046143d5369f7d7c63c64ca3
parent 0547da63dea7cb8454b01d91051ba65d0bd115e8
author Conley Owens <cco3@android.com> 1389654237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389654237 +0000

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

* commit '0547da63dea7cb8454b01d91051ba65d0bd115e8':