| commit | 8c832e9f766edfc6130c3eea30e1869e2db8de26 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Sep 28 11:33:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 11:33:54 2012 -0700 |
| tree | 89155fe5d0ce4c3cddabf73ddf3dc5e497bb3276 | |
| parent | 54801e120a2275037e37f065926b81d9f6e4b3d5 [diff] | |
| parent | ad8bda219e9d9b18144ace7853997c536bb2f1fc [diff] |
am ad8bda21: (-s ours) am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes * commit 'ad8bda219e9d9b18144ace7853997c536bb2f1fc': DO NOT MERGE - Full (local) restore security changes