OSDN Git Service

am fedfb465: (-s ours) am c6cc7335: am 7b265a6b: Fix the flash mode transition in...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)
* commit 'fedfb465bb28fd41c2ba1f25b5dc2f002e03d723':


Trivial merge