OSDN Git Service

am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:42:01 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:42:01 +0000 (12:42 -0700)
commit9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c
tree260be3ae7acecccb7ddf72a06a913149ee41661c
parenta374d81605f4ba760db9613dd8aa8d8a0370dab8
parentf4b1aefbaafba7ba290a05bce84f77ee5ad5b043
am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':