| commit | 61dddba79f6412f4c889d4fa010f433f1dbc6e04 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Tue Mar 19 15:43:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 19 15:43:56 2013 -0700 |
| tree | accd2e98b58ccf92c30ec52f39dc4ede20485645 | |
| parent | 62495abcdce58c930eb5826eeb51ddaef5a0ac05 [diff] | |
| parent | 04598de87251c433594f1073ebcd8116cee49345 [diff] |
am 04598de8: Merge "Replaceable mac_permission.xml support" * commit '04598de87251c433594f1073ebcd8116cee49345': Replaceable mac_permission.xml support