| commit | b6108833946e864eeb8d5f50e623558d70f41591 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Wed Jun 03 02:28:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 02:28:58 2015 +0000 |
| tree | 43bf576bdaa617f28ab91b693182472f5f8766e2 | |
| parent | bd36699d8b3eb57e3a064e0789e87853f9574880 [diff] | |
| parent | 858bdb46a51cc462242c946351f75e6476307043 [diff] |
am 858bdb46: resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp * commit '858bdb46a51cc462242c946351f75e6476307043': mkbootimg: delete obsolete C source