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