| commit | 3935e57745d06256273bf12b4f531e48125a2170 | [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 | 9e0c4a0a020fb296ea9dea5f9e7b0c74f85a4d24 [diff] | |
| parent | 094634dfe447bdef7340a8253200f1082ea849cf [diff] |
am 858bdb46: resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp * commit '858bdb46a51cc462242c946351f75e6476307043': mkbootimg: delete obsolete C source