tree d260033630b81a5118fc0ceec0f8aa3bbea52dab
parent 5ac31500c8da0ee4559bfa92721ed3d75bf28ccc
parent 2384a4dceedc1218aaaf62bb91e4a05cdbe3425d
author Andrew Hsieh <andrewhsieh@google.com> 1333381068 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333381068 -0700

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

* commit '2384a4dceedc1218aaaf62bb91e4a05cdbe3425d':
  Remove auto-gen project.properties