OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53c5dad 0a24799)
am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already...
authorZhentao Sun <robinvane@google.com>
Tue, 1 Sep 2015 01:05:45 +0000 (01:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 01:05:45 +0000 (01:05 +0000)
* commit '0a247995d79149b891ab6fad5dc0a1cb584d111c':
  Don't launch the camera if it already in foreground.


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