diff options
| author | Chris Palmer <palmer@google.com> | 2010-09-27 21:02:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:02:20 -0700 |
| commit | 27be57a231ae8e63da1f71ebee9bc4244986558f (patch) | |
| tree | 28d86a677b683e3fdf5c77ce99ed541edfa522c7 /core/java/android/webkit/WebViewDatabase.java | |
| parent | de8652cbc120d2d79ec321bc54506fc5577e7928 (diff) | |
| parent | d4f1436d6abf60bb299cc57330f7fc37cb161853 (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.
Diffstat (limited to 'core/java/android/webkit/WebViewDatabase.java')
0 files changed, 0 insertions, 0 deletions