tree a384abb0887ebda8df9d6477de5005222d28f7fd
parent 74a53f471a9dedb3ee6e9b75437a749e0d403baa
parent ab362eb8fe6863b3284a09cd79fb99c3d9d3310d
author Brian Muramatsu <btmura@google.com> 1338849082 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338849082 -0700

Merge "Fix PermissionInfoTest#testPermissionInfo" into jb-dev