tree 1c76fa5a0f84fb420cd99d075f7405878dbeba06
parent 696cdf7d5cd48f74515df9321261c490c68803e4
parent 2ca5c75ba130e0e0b508ed07b7bc74a3cc28038f
author Ying Wang <wangying@google.com> 1390601769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390601769 +0000

am 2ca5c75b: am 443c9dc8: am c236e00e: am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"

* commit '2ca5c75ba130e0e0b508ed07b7bc74a3cc28038f':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources