Tao Bao 8fdce9ab99 resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I59d27cec1ef2c6befe824848cdc9ef3b0a0dc586

2017-03-28 17:58:31 -07:00

..

common

recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs

2017-03-10 17:27:31 +08:00

component

resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp

2017-03-28 17:58:31 -07:00

manual

Add checkers and tests for empty locale in PNG file

2017-01-18 19:37:06 -08:00

testdata

tests: Construct two bad packages at runtime for VerifierTest.

2017-03-27 16:10:11 -07:00

unit

Add the missing sr-Latn into png files and rename the png locale header

2017-03-24 16:54:52 -07:00

Android.mk

Remove the dead #include's in verifier.cpp.

2017-03-18 09:28:42 -07:00