OSDN Git Service

am a87489b5: am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge...
authorYing Wang <wangying@google.com>
Fri, 21 Feb 2014 18:34:53 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:53 +0000 (10:34 -0800)
commit93f5971663ad9d17994605a1851355fa6005dd29
tree506ba541c0415250abe0ba762a061fc208773a4d
parent1c9537e16de86a6509c1fee812da9400a146dd14
parenta87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0
am a87489b5: am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

* commit 'a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0':
  Allow proguarding the main app and the test app in a single run.