OSDN Git Service

am 218d4962: am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings:...
authorMark Salyzyn <salyzyn@google.com>
Fri, 19 Sep 2014 08:10:16 +0000 (08:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 08:10:16 +0000 (08:10 +0000)
* commit '218d49625bc2c9849f76f990c8e14873a84a8161':


Trivial merge