OSDN Git Service

am 5dde9123: am 6443630c: am 441e9452: resolved conflicts for merge of f3e25fea to...
authorColin Cross <ccross@android.com>
Mon, 12 May 2014 23:29:15 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:29:15 +0000 (23:29 +0000)
commit21faaa453f778e892ac480cbed8ecd34ebc84e8d
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent0f6420ad3c43bbdeabf3254ec3deb4601556336b
parent5dde91231bd05821080b5bad60f337ab9368ec22
am 5dde9123: am 6443630c: am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp

* commit '5dde91231bd05821080b5bad60f337ab9368ec22':