commit | 829944e85d0b2abeba9141fb1f47bb52993acd66 | [log] [tgz] |
---|---|---|
author | Geremy Condra <gcondra@google.com> | Tue Mar 26 12:31:38 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:31:38 2013 -0700 |
tree | 6872229f602de88dbc0b9732851904c98b5215a4 | |
parent | 2a6d0ace882979537c8b2589be3399a0e77d244b [diff] | |
parent | 82fe3d249f40629fe40f4feed258cccd95b2a374 [diff] |
am 82fe3d24: Merge "Revert "Rewrite mac_permissions.xml file."" * commit '82fe3d249f40629fe40f4feed258cccd95b2a374': Revert "Rewrite mac_permissions.xml file."