OSDN Git Service

am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:35 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:35 +0000 (13:13 -0700)
commit10f06dc0787c20d9ffab07e59654322b9348c056
tree257e3dcf4801f649618a44c453253c016d953903
parent8d674a4b6f4300df90415889c2f57fe8b383e867
parent0b904fdaa636372e9173f1fb4a5dae5c382aabb8
am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0b904fdaa636372e9173f1fb4a5dae5c382aabb8':