tree 325cc206d84d8edd9e5c472890af6f010d1fd6b4
parent e14e50c3469c72a60495c912f7798f88bc547a67
parent 36f94250447da75428f409183e9faba2118bd5ae
author Raphael Moll <ralf@android.com> 1403381952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403381952 +0000

am 36f94250: (-s ours) am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

* commit '36f94250447da75428f409183e9faba2118bd5ae':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.