Merge "Merge "Remove has_trivial_move trait from StringPool types" am:...

#include <androidfw/ResourceTypes.h>

#include <utils/String16.h>

#include <utils/TypeHelpers.h>

#include <sys/types.h>

#include <sys/stat.h>

    Vector<size_t>                          mOriginalPosToNewPos;

};

// The entry types are trivially movable because all fields they contain, including

// the vectors and strings, are trivially movable.

namespace android {

    ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry);

    ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style_span);

    ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style);

};

#endif