| commit | 849f5188e34ea667b689e795d88411a2412db2e8 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Nov 30 10:35:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 10:35:44 2012 -0800 |
| tree | 5f15d17738ad91ae0bf670594d10dc8092615521 | |
| parent | 0a6620e8615ade341336730a5aa9f0e62a295c9f [diff] | |
| parent | 6643ea823bf8b0726da0518ffecfcc7a9f60f87d [diff] |
am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev * commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d': Secure a handful of framework broadcasts