am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.

Browse Source

Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'

* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
  DO NOT MERGE Clarify the explanation of Android's security design.

...

This commit is contained in:

Chris Palmer 2010-09-27 21:02:20 -07:00 committed by Android Git Automerger

parent 81948205bf f842cbb8e8

commit cb3459e248

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available