OSDN Git Service

am 69d530f8: am c26c52a6: am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Mar 2013 20:32:06 +0000 (20:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 20:32:06 +0000 (20:32 +0000)
commitd96e8b0d72e212b8d60be7ddbc2d0a97a6cfa6d6
treeebecc66a6dfa24b2274e26338d824aae945138ba
parente1bb1d21f9b58ba4e8d8ba7f1c97a308c4c18ca9
parent69d530f81e68b468f862f232451f10bb7ffde427
am 69d530f8: 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 '69d530f81e68b468f862f232451f10bb7ffde427':