OSDN Git Service

am 83f9b837: (-s ours) am 3c3c63ea: am 644c534f: am 623b74b6: Add HDR+ mode strings...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
* commit '83f9b8371d7b863ca05e5db91fa611ceee2e3d71':


Trivial merge