Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp * commit '703e5d3c7fbeb8ca0978045db01d40318f838612': StrictMode: avoid an allocation in common case
Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp * commit '703e5d3c7fbeb8ca0978045db01d40318f838612': StrictMode: avoid an allocation in common case