OSDN Git Service

am 94867800: am 680c92fe: resolved conflicts for merge of 13ef17a3 to cw-e-dev b...
authorHyunyoung Song <hyunyoungs@google.com>
Tue, 28 Jul 2015 19:58:37 +0000 (19:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jul 2015 19:58:37 +0000 (19:58 +0000)
* commit '9486780029868bc04e2bd2f2c2ed34283fa2d25d':


Trivial merge