OSDN Git Service

am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus...
authorYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:37:33 +0000 (18:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Feb 2014 18:37:33 +0000 (18:37 +0000)
commit74b71317711fe4bacc6422e45de599fea840f061
tree93c847ac15a89779acc65789ed5d71524fe85138
parent7495e68a61075ef592aff6f2ba4d1d06fe3fedf4
parent2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb
am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

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