| commit | eb89803886d0153347aead99480716c5e0bd8289 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Sep 01 20:06:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:06:42 2015 +0000 |
| tree | 28a62b5513d27549c069d42271383290e83a9c11 | |
| parent | 1fee9957f5081ece6c44ffcf28f6bb7b42abd152 [diff] | |
| parent | 0199476939296795fdfdfc9635c9172e70495d2c [diff] |
am eb65ce0a: resolved conflicts for merge of 7c4ed6af to stage-aosp-master * commit 'eb65ce0a240f9591019b8a40e17d25e86a131e35': fs_mgr: Add support for A/B partitions