OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f11f9f4
2f3bc3c
)
am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity...
author
Fyodor Kupolov
<fkupolov@google.com>
Thu, 29 Jan 2015 18:45:51 +0000
(18:45 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 29 Jan 2015 18:45:51 +0000
(18:45 +0000)
* commit '
2f3bc3cb3f5add3962fb0ad441c27d44fede7787
':
Added a check if a custom activity can be started
Trivial merge