d538291517
Merge commit '0bceb77b004a688ca044b794e0622385c6e2953d' * commit '0bceb77b004a688ca044b794e0622385c6e2953d': Fixes #1922373. Resolves a case of keys collision in Resources' cache. |
||
---|---|---|
awt | ||
camera/libcameraservice | ||
cmds | ||
im/java/android/im | ||
include | ||
libs | ||
opengl | ||
vpn/java/android/net/vpn | ||
MODULE_LICENSE_APACHE2 | ||
NOTICE |