commit | 93e3add9a2deb1cb0a016f5481e7220ab44d46ca | [log] [tgz] |
---|---|---|
author | Siva Velusamy <vsiva@google.com> | Fri May 16 22:01:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 16 22:01:28 2014 +0000 |
tree | aa1d23fe438d9c54e29766df05eac36ebd6a1637 | |
parent | a89cbbcbf932ca276d82fc6bb14134b0e53d0305 [diff] | |
parent | f38ceed5c94261b82243ceff909e03f8d4880893 [diff] |
am f38ceed5: am 024abc03: Merge "Add freemarker 2.3.20 to prebuilt m2 repo" into idea133 * commit 'f38ceed5c94261b82243ceff909e03f8d4880893': Add freemarker 2.3.20 to prebuilt m2 repo