Reset: Back to PA's Jellybean-Legacy branch

with my local manifest repo included