| commit | b8c20461d3dfc3dc5e747f9ce568946313cea0fd | [log] [tgz] |
|---|---|---|
| author | Mohamad Ayyash <mkayyash@google.com> | Thu Mar 05 00:06:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 05 00:06:34 2015 +0000 |
| tree | 3411d4c5c19d4fd4f736e79bf6aa747cbf423aa8 | |
| parent | e925e7fd1b7a2323ac503e7f9636cba2ce1d1264 [diff] | |
| parent | 29a01789930f74ffecba7f6360577e5703092606 [diff] |
am 29a01789: am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master * commit '29a01789930f74ffecba7f6360577e5703092606': Allow flashing a squashfs system image