OSDN Git Service

am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
authorChris Palmer <palmer@google.com>
Mon, 27 Sep 2010 21:18:15 +0000 (14:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Sep 2010 21:18:15 +0000 (14:18 -0700)
commitf842cbb8e8391167d7a5b95f0f41d397e3b07680
treef1f0e7831502036b3e854a76778f8c6ae8d6def6
parentd9806b8fd8c52e5cca8b3b9165bee43679aa4084
parent674166e6fc41f8624f7d06dfb69a56dce3e4adb1
am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.

Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

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