OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9863ba3 a204ca3)
am a204ca3f: am f991256b: am a90c453d: Merge "Make CameraService proxy retry behavior...
authorRuben Brunk <rubenbrunk@google.com>
Tue, 2 Jun 2015 21:26:52 +0000 (21:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 21:26:52 +0000 (21:26 +0000)
* commit 'a204ca3f9486f12438291eb8c5a8a7adba9acd3f':
  Make CameraService proxy retry behavior more lenient.


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