| commit | 74b71317711fe4bacc6422e45de599fea840f061 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Feb 08 18:37:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 08 18:37:33 2014 +0000 |
| tree | 93c847ac15a89779acc65789ed5d71524fe85138 | |
| parent | 7495e68a61075ef592aff6f2ba4d1d06fe3fedf4 [diff] | |
| parent | 2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb [diff] |
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.