| commit | dad57a65867a7d571bfe3bc1a7b213bc3fdbbfaf | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Dec 23 13:43:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 23 13:43:12 2014 +0000 |
| tree | 5da34623957495242493c58604bf68397e2f5340 | |
| parent | 44f3f7907affec2b479101869941cbcda56b938b [diff] | |
| parent | bfb520ef3572b915acff66b4da8fe3cef7c4c52c [diff] |
am bfb520ef: Merge "Temporary workaround to prevent automated jarjar renaming." * commit 'bfb520ef3572b915acff66b4da8fe3cef7c4c52c': Temporary workaround to prevent automated jarjar renaming.