OSDN Git Service

am af93f558: am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)
commit50a8cbbe7660caa7dec074415e8d9e34192c49a3
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent885bdec525d1e2c2e002578c63d9b235f9a0c796
parentaf93f5585e2301b1828874d1abef94e521119379
am af93f558: am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit 'af93f5585e2301b1828874d1abef94e521119379':