| commit | 4816f4b4088ce35b2cddf1034ae483e30b7ed22c | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Nov 30 10:40:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 10:40:18 2012 -0800 |
| tree | 2f249b73ff93c10679885680b0e71636d69bdbd2 | |
| parent | 590e0e5b8dbc1f9d9bef69d675b158d6a36ac073 [diff] | |
| parent | 0def7b94960ae551c498212d97c7919da7529429 [diff] |
am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev * commit '0def7b94960ae551c498212d97c7919da7529429': Secure a handful of framework broadcasts