| tag | ea54898e3365c2e2b1bb6406b7e2eb9969d32e46 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 06 11:37:09 2016 -0700 |
| object | 4f1abe1323dda9fee02e98e7b55bae7b8984eab4 |
Android N Preview 3 Release 0.3 (NPD35K)
| commit | 4f1abe1323dda9fee02e98e7b55bae7b8984eab4 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue May 03 09:52:28 2016 -0700 |
| committer | Greg Hackmann <ghackmann@google.com> | Tue May 03 09:52:28 2016 -0700 |
| tree | c8bf34b9a3fca6f5ac706b70dc29be54a79c573d | |
| parent | e46785965a9d7ca710d442245d30b1172798d907 [diff] | |
| parent | 7e42928b5effaf28e22bf49e1440354dc57170fe [diff] |
Merge branch 'android-tegra-3.10' into android-tegra-flounder-3.10-n-preview 3c71420 BACKPORT: f2fs: add a max block check for get_data_block_bmap 2564b24 fuse: Add support for d_canonical_path 1201271 vfs: change d_canonical_path to take two paths Conflicts resolved in fs/f2fs/data.c and fs/f2fs/super.c to match closer to upstream. Change-Id: I420946e9427d15c61bdd7e1e0b518b85241738c4 Signed-off-by: Greg Hackmann <ghackmann@google.com> Bug: 28271368 Bug: 23904372