| commit | 8e5b540cffeac75f698020b9fbbb24dcd7d6b061 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Sep 08 14:48:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 08 14:48:38 2011 -0700 |
| tree | 863e55a78659497a59529a7982dcda6ed6ef66b2 | |
| parent | d62de0f88450e310188234ee1b3d5afdd0312b9a [diff] | |
| parent | 41346ae4077c7dee66a7c04dc91714569dca9303 [diff] |
am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp * commit '41346ae4077c7dee66a7c04dc91714569dca9303': Allow uninstallable APPs.