tree 99a84f8ee4fc203260e24377f7bf8a81fe8902db
parent 52afa28f315a3ad5a8dffb3c98df5e77e579e529
parent 7da9740acdf30356512bea414d4af6efd6db3e40
author Ying Wang <wangying@google.com> 1390599811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390599811 -0800

am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"

* commit '7da9740acdf30356512bea414d4af6efd6db3e40':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources