| commit | 7ed9bf58fab78776f0f80cfc90b217e4d109ef62 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 13:05:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 13:05:02 2012 -0700 |
| tree | baf5339f8dbb1f4affa4be1b569c5049e07e834d | |
| parent | 90716049ab43ff52409d3a6b993848248a509d4c [diff] | |
| parent | a03a381cb1c6fb92d3afc437bb74e0fccbc24882 [diff] |
am a03a381c: (-s ours) am 59adf04a: am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'a03a381cb1c6fb92d3afc437bb74e0fccbc24882': DO NOT MERGE - Full (local) restore security changes