tree 3ad29d60a431a4734238209aa30a9104140fd7b0
parent d2e6f894cfe4df9ab8fdfb44114b245115e58645
parent dd0a8b2ec052e0cc670cb8738b0f6ed7b292f122
author Tor Norbye <tnorbye@google.com> 1339791400 -0700
committer android code review <noreply-gerritcodereview@google.com> 1339791401 -0700

Merge "Dependency support for the templates"