OSDN Git Service

am 456e415b: (-s ours) am 14ec1b58: am ceb670cf: Merge branch \'klp-dev\' of https...
authorElliott Hughes <enh@google.com>
Thu, 5 Dec 2013 22:50:00 +0000 (22:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:50:00 +0000 (22:50 +0000)
* commit '456e415b93d75233c1948a6398521128c2d5afef':


Trivial merge