OSDN Git Service

am c26c52a6: am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)
commit69d530f81e68b468f862f232451f10bb7ffde427
treeebecc66a6dfa24b2274e26338d824aae945138ba
parentbbdb87dbf580d862885ddbe276e287c515c67fe8
parentc26c52a6a0d097e2e28804347d8b0ada758109fa
am c26c52a6: am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c26c52a6a0d097e2e28804347d8b0ada758109fa':