| commit | 2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Feb 08 18:35:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 08 18:35:13 2014 +0000 |
| tree | 68173b285b7d18e6ef3dcfe0cc08458581a8271f | |
| parent | dc7fee9fbf46ac06c840c7edfd51fbefeece63e4 [diff] | |
| parent | 960d919e814726f05ad1a9b82e6a9677f9977f15 [diff] |
am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp * commit '960d919e814726f05ad1a9b82e6a9677f9977f15': Allow proguarding the main app and the test app in a single run.