diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:59:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 17:59:49 -0700 |
| commit | 33c42474353ea6260c426f1cb5109ad019df533e (patch) | |
| tree | c3ee51f35f014825e04f6dc097954d39bf9b1442 /docs/html/sdk/api_diff/6/changes | |
| parent | cd44bf9c7ae89edcf906451e162d096cf3d7e561 (diff) | |
| parent | 55744530222288c79a5e1aa61b65f7f6b2262fab (diff) | |
am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'
* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked
Diffstat (limited to 'docs/html/sdk/api_diff/6/changes')
0 files changed, 0 insertions, 0 deletions