OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 821df85 adb3a19)
am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activ...
authorSteve Moyer <smoyer@google.com>
Sun, 16 Mar 2014 17:35:30 +0000 (17:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Mar 2014 17:35:30 +0000 (17:35 +0000)
* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
  Don't attempt to launch disabled activities in smoke test.


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