tree e0dd99623db4548b5b46b20911c919bb2bd12d40
parent 5a1c0e397de92926524a885f57c302867db46ef5
parent 0a4d7d8b6e5880afaa93cf58ab49ba0c410a3169
author Steve Kondik <shade@chemlab.org> 1354778776 -0800
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> 1354778776 -0800

Merge "jenkins: add manta" into mr1-staging