OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e83e33 86b6357)
am 86b6357e: Manual f/b merge of lockhotness camera integration.
authorJohn Spurlock <jspurlock@google.com>
Mon, 29 Oct 2012 19:45:17 +0000 (12:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 19:45:17 +0000 (12:45 -0700)
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
  Manual f/b merge of lockhotness camera integration.


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