OSDN Git Service

am eaaca513: (-s ours) am 6911bfca: am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCame...
authorRuben Brunk <rubenbrunk@google.com>
Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)
* commit 'eaaca5130356a9bb2e38d590b63072ed507f5f9d':


Trivial merge