| commit | cb3459e248ae1df8f74b89578b1f4321f3fec6ad | [log] [tgz] |
|---|---|---|
| author | Chris Palmer <palmer@google.com> | Mon Sep 27 21:02:20 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 27 21:02:20 2010 -0700 |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 | |
| parent | 81948205bf8ac383e8c140fd82988f718a3fac4f [diff] | |
| parent | f842cbb8e8391167d7a5b95f0f41d397e3b07680 [diff] |
am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853' * commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853': DO NOT MERGE Clarify the explanation of Android's security design.