| commit | 1558092bf0d26365cec0cd106f19da75ec772c7e | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Wed Sep 09 18:03:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 09 18:03:22 2015 +0000 |
| tree | 59be098a67302a51deda6e6f9522b2270a746dfb | |
| parent | 2eea6f6c9a48790d5c4c348d1aa570fe95cd297b [diff] | |
| parent | dc00610496d39b7a782e4b595e1fa284bd945f77 [diff] |
am 1c7060e0: resolved conflicts for d8eed7ff to stage-aosp-master * commit '1c7060e055b117321ddbeae533bdeb54cd5e808a': fs_mgr: Use slot_suffix field from bootloader_message.