am fe3992fa: (-s ours) DO NOT MERGE: Add missing images_x86_source.prop_template
authorJi-Hwan Lee <jihwan@google.com>
Wed, 4 Jun 2014 21:52:41 +0000 (21:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 21:52:41 +0000 (21:52 +0000)
commit5125ddce0e451c1c68049de265f0dcd60a526f1c
treee30e9a68dfbe3975188003e7a9efe06acb289a92
parent334ee062543e66ef3b3d03464778531f5a50517e
parentfe3992faf2b89648c2a53c348573cf836b842e54
am fe3992fa: (-s ours) DO NOT MERGE: Add missing images_x86_source.prop_template

* commit 'fe3992faf2b89648c2a53c348573cf836b842e54':
  DO NOT MERGE: Add missing images_x86_source.prop_template