am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo

Merge commit '3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp

* commit '3a010fa6192f09121fc920810c5a8366b5b09f46':
  Doc change: remove pdf summary of guidelines from templates archive.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base