tree f882aec45c05c8862b6d7bac1e9313beaf933904
parent d87e9d353430779e00551eb394f5b9340099470a
parent 6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc
author Raphael Moll <ralf@android.com> 1401918373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401918373 +0000

am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.