| commit | 59adf04ab391d5cbfb8d031eff39937aebabade1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 12:58:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 12:58:34 2012 -0700 |
| tree | 105b62fc3f9d6622ebff42ebab23da8324ce7e93 | |
| parent | aa64b11020c5283509c7ef37ecfe274a4f6b45f4 [diff] | |
| parent | 7e8c613f823b382ecc7cab843e2920aa5dd05447 [diff] |
am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '7e8c613f823b382ecc7cab843e2920aa5dd05447': DO NOT MERGE - Full (local) restore security changes