tree a071423e3848980dcb1236da76e0653c56678d30
parent 7cd62f769c6cf5ae46a29230ddf8755f0a9ccc07
parent d63680fbc4da40fc6b29039e04d6a38137d38021
author Andrew Hsieh <andrewhsieh@google.com> 1333378695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333378695 -0700

am d63680fb: am 9487df9a: Merge "Remove auto-gen project.properties"

* commit 'd63680fbc4da40fc6b29039e04d6a38137d38021':
  Remove auto-gen project.properties