| commit | e75cfdc7e7535acd80d7676b0298fb8eb0c608ff | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Jan 22 19:08:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 19:08:08 2015 +0000 |
| tree | df8bb64a3599946cae82ee74fd44fca4d2a96d73 | |
| parent | 9707150d10b5e323a8244bc8cc8f8762457d1dd2 [diff] | |
| parent | cba5c4007938cbcdd46b0640af8a864f6fb89fa5 [diff] |
am cba5c400: Merge "Revert "Temporary workaround to prevent automated jarjar renaming."" * commit 'cba5c4007938cbcdd46b0640af8a864f6fb89fa5': Revert "Temporary workaround to prevent automated jarjar renaming."