| commit | 865369e63b45132ea53295224688daf48404b0f8 | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Wed Jun 24 02:13:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 02:13:41 2015 +0000 |
| tree | 2cb0ee15d297372c03bc83926f15b791d5f806c3 | |
| parent | 344af6d18cca2b01428e9c00abc6ad19be5ec002 [diff] | |
| parent | 9ff8a7162b1c6f8d10768537a8e3f45601d8d6da [diff] |
am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev * commit '9ff8a7162b1c6f8d10768537a8e3f45601d8d6da': Allow flashing a squashfs system image