OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e4082f 7f76c50)
am 7f76c502: (-s ours) am 06508824: am f0d8468d: DO NOT MERGE: CameraService: Fix...
authorEino-Ville Talvala <etalvala@google.com>
Fri, 20 Jun 2014 19:56:38 +0000 (19:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jun 2014 19:56:38 +0000 (19:56 +0000)
* commit '7f76c50257f131cb26c1c21ede2622cb7ad534bf':
  DO NOT MERGE: CameraService: Fix permissions check issues


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