| commit | 9ff8a7162b1c6f8d10768537a8e3f45601d8d6da | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Wed Jun 24 01:38:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 01:38:26 2015 +0000 |
| tree | 2fcd2f95ae3c0e992e7d4a3dbe03d52dfb42e81e | |
| parent | 7102f57781a8cde2e450951af3cbd7e60b44dca1 [diff] | |
| parent | f35ed6bd8497633c057030e5442cd0fc29b37b6c [diff] |
am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev * commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c': Allow flashing a squashfs system image