OSDN Git Service

am 9a0ae9b7: (-s ours) am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:56:23 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:56:23 +0000 (20:56 +0000)
commit75b3e82bce243f9b4da1a02ed89a44fe19a4742f
tree7950121d7866e6883d71f751af27d1a8e2ffc175
parentfd46e31ab9f956dae558ba31988b221843d9746b
parent9a0ae9b77dd8d886faa93b7360277e09417ba11c
am 9a0ae9b7: (-s ours) am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9a0ae9b77dd8d886faa93b7360277e09417ba11c':