tree 61417aefd01d219a352a4e5fb279a8f828251519
parent 40a65ab4e6b71ad266bb29eb129283d6d709b7e9
parent be49598e2d7609e50eadd0dcba2190c01265c0a9
author Xavier Ducrohet <xav@android.com> 1252696009 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252696009 -0700

am be49598e: Merge change 24712 into eclair

Merge commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp

* commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9':
  Fix CS templates to handle non-included classes.