tree f55edd28186cc7b2bf1e691e92ffb44015f289a1
parent ec5dc76a15081136fa57d10a231d1c5ac5901421
parent 083c4dc1ac8365f324e8680abc27cf696bc760e7
author Kristian Monsen <kristianm@google.com> 1366165345 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366165346 +0000

Merge "Part of fix for bug 8629392" into jb-mr2-dev