OSDN Git Service

am 2a5d2e98: am 9e9d1e01: resolved conflicts for merge of 86125aca to klp-dev
authorElliott Hughes <enh@google.com>
Thu, 5 Dec 2013 19:37:50 +0000 (19:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:37:50 +0000 (19:37 +0000)
commitad9742f8890c18c6b7f4723139bf135713740877
tree95e5c7d59b500d03e891eb590341fc7eaae6a769
parent0ee109a488e667fa038b3550c2441d35b46b3b8d
parent2a5d2e98f9ffbddf37d8d57ed3028c3c8349e351
am 2a5d2e98: am 9e9d1e01: resolved conflicts for merge of 86125aca to klp-dev

* commit '2a5d2e98f9ffbddf37d8d57ed3028c3c8349e351':