| commit | b63853861ed94e19eb4234dcb1025d213d64785b | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Wed Jun 01 20:17:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 01 20:17:38 2016 +0000 |
| tree | 909cc27b3cbc4df2a18f7614496b8eac2888cef4 | |
| parent | 3665675b361e43dc49092a6660848cd39a8a3620 [diff] | |
| parent | 409b555f94fd836a8700f69f27ac38f478a3ffab [diff] |
resolve merge conflicts of adadb7d to nyc-dev-plus-aosp am: c1b985435f am: cc575f5955 * commit 'cc575f595594d61c8ff2ea900f394bf1483248eb': fs_mgr: pass sehandle to ext4 format routine Change-Id: I1ad4c6699e434240f02364ee9d85ba551750a04b