OSDN Git Service

am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to...
authorYing Wang <wangying@google.com>
Mon, 10 Feb 2014 12:51:36 +0000 (12:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Feb 2014 12:51:36 +0000 (12:51 +0000)
commita87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0
tree907d7e878b11a0445f49687dc839f8adeb374d8b
parent2ad7d4df0746e7e16fd3cc39d14fa352801abcae
parent74b71317711fe4bacc6422e45de599fea840f061
am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

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