OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a73e14e 63301fe)
am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and...
authorDirk Dougherty <ddougherty@google.com>
Tue, 24 Aug 2010 00:52:41 +0000 (17:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 00:52:41 +0000 (17:52 -0700)
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help