OSDN Git Service

am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:53 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:53 +0000 (13:13 -0700)
commit484bdcab1e7e64c2ad6ee36b9d216dbc94e82608
tree4b39b7332353a649daf9e5f795b278f48ee571fc
parent3911886e854d31058e7d3a6e310e8eafd06c02e0
parent63790dce7a791ef575ea80d69776324e15ecf701
am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63790dce7a791ef575ea80d69776324e15ecf701':