| commit | a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Feb 10 12:51:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 10 12:51:36 2014 +0000 |
| tree | 907d7e878b11a0445f49687dc839f8adeb374d8b | |
| parent | 2ad7d4df0746e7e16fd3cc39d14fa352801abcae [diff] | |
| parent | 74b71317711fe4bacc6422e45de599fea840f061 [diff] |
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.