OSDN Git Service

am c94a531b: am 19753f45: am bbfebfad: resolved conflicts for merge of 303d2755 to...
authorJustin Koh <justinkoh@google.com>
Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)
commita81d24f38d1ecddc51f93a8c269343adc12f5913
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent41dde3e0ae6b47db32bff03e3b0a8b756af3a0b8
parentc94a531b086aed89fd90c12d9ec8a722c156b4e3
am c94a531b: am 19753f45: am bbfebfad: resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp

* commit 'c94a531b086aed89fd90c12d9ec8a722c156b4e3':