| commit | 51ad68b9a5d5a8eb705eafd40833efca24731079 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Fri Apr 05 16:40:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 05 16:40:59 2013 -0700 |
| tree | e808165883935bc7e80095cc8e37056bae358d2e | |
| parent | e7abcc7d49231435607847691f1b1abc5d49c781 [diff] | |
| parent | 212af6dbd7b002bdfcc869fc0ee06d5d3d711fd6 [diff] |
am 212af6db: Merge "Add /data/security path for mac_permissions.xml." * commit '212af6dbd7b002bdfcc869fc0ee06d5d3d711fd6': Add /data/security path for mac_permissions.xml.