Firefly 8490f28bff [system/core] Merge tag 'android-5.1.1_r13' into HEAD ...

Android 5.1.1 release 13

Signed-off-by: Firefly <service@t-firefly.com>

Conflicts:
	fs_mgr/fs_mgr_priv.h

2015-12-31 16:52:28 +08:00

..

fs_mgr.h

[system/core] Merge tag 'android-5.1.1_r13' into HEAD

2015-12-31 16:52:28 +08:00