OSDN Git Service

am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:46 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:46 +0000 (13:00 -0700)
commit009b05028ced67523e257a2abbdc5c07776f0ceb
tree616c1fe17f77b10f8bdbd520c4b06af4f08ede96
parent5e86fd1570b943e02d8435b2ce27a1806b72ee2c
parent63e1a5a9076f90e9e704e06956ba414a1d28c6a3
am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63e1a5a9076f90e9e704e06956ba414a1d28c6a3':