OSDN Git Service

am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)
commit2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb
tree68173b285b7d18e6ef3dcfe0cc08458581a8271f
parentdc7fee9fbf46ac06c840c7edfd51fbefeece63e4
parent960d919e814726f05ad1a9b82e6a9677f9977f15
am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
  Allow proguarding the main app and the test app in a single run.
core/clear_vars.mk