| commit | 7113a9aa8caf64ae8eb7f4633165425ee00f3445 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Aug 03 21:34:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 21:34:14 2015 +0000 |
| tree | b3814f7fc72c5d741545a07ba1f59ad49968241c | |
| parent | ae6646b14c0c039331ca5b1fe6d858c8bcc3a474 [diff] | |
| parent | 35a58d5ee7da5470460e95ae74361e89e1e55a15 [diff] |
am 087cd35b: resolved conflicts for merge of 0070026c to mnc-dr-dev-plus-aosp * commit '087cd35b79151978e0f119af32748fbce02564be': init: use std::vector<std::string> for argument passing