tree ce7083f0aaf84ee210ebad3962eee499b5213e9a
parent 0e50619ad29b270ea05d7ab3d7705b54b0876872
parent 3057adbace1eb57cd73f982eb06d897632ece554
author Ying Wang <wangying@google.com> 1379047045 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379047045 -0700

am 3057adba: Drop the [no]proguard. prefix for the intermediate targets

* commit '3057adbace1eb57cd73f982eb06d897632ece554':
  Drop the [no]proguard. prefix for the intermediate targets