OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4a306fd
363c694
)
am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc...
author
Zhentao Sun
<robinvane@google.com>
Tue, 1 Sep 2015 00:47:04 +0000
(
00:47
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 1 Sep 2015 00:47:04 +0000
(
00:47
+0000)
* commit '
363c694a448d90322936526d78a9878de0003d0e
':
Don't launch the camera if it already in foreground.
Trivial merge