| commit | bf538f084839b5e9911a9035b3e10070da30d68e | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Sep 01 20:17:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:17:56 2015 +0000 |
| tree | ad8da0f63f133fae9e3b3ce6691dddb33f43d5d6 | |
| parent | 73a12c2b32bfae2795a1b6ced5ce72fa1f331ea2 [diff] | |
| parent | eb89803886d0153347aead99480716c5e0bd8289 [diff] |
am 11f0d159: am eb65ce0a: resolved conflicts for merge of 7c4ed6af to stage-aosp-master * commit '11f0d159a13b0be2fc947bf84f08a77fd9d2af42': fs_mgr: Add support for A/B partitions