OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6da2fb6 50eebe0)
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 10 Jun 2016 19:44:03 +0000 (19:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 10 Jun 2016 19:44:04 +0000 (19:44 +0000)
* changes:
  Camera2: Fix error codes for CameraDevice.StateCallback.onError()
  Camera2: Protect MarshalRegistry against concurrent access


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