Merge "Don't pollute the namespace for two uses."

#include <utils/Log.h>

#include "ResourceIdCache.h"

#include <map>

using namespace std;

static size_t mHits = 0;

    CacheEntry(const android::String16& name, uint32_t resId) : hashedName(name), id(resId) { }

};

static map< uint32_t, CacheEntry > mIdMap;

static std::map< uint32_t, CacheEntry > mIdMap;

// djb2; reasonable choice for strings when collisions aren't particularly important

        bool onlyPublic) {

    const String16 hashedName = makeHashableName(package, type, name, onlyPublic);

    const uint32_t hashcode = hash(hashedName);

    map<uint32_t, CacheEntry>::iterator item = mIdMap.find(hashcode);

    std::map<uint32_t, CacheEntry>::iterator item = mIdMap.find(hashcode);

    if (item == mIdMap.end()) {

        // cache miss

        mMisses++;