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)
* commit 'a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0':
  Allow proguarding the main app and the test app in a single run.


Trivial merge