tree 5da34623957495242493c58604bf68397e2f5340
parent 27baa6a6dbc257f38922f59015bbc1ef98f25802
parent 19073bca93281204c5d0c42b04811ac0e6ef3bdd
author Narayan Kamath <narayan@google.com> 1419341636 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1419341636 +0000

Merge "Temporary workaround to prevent automated jarjar renaming."