OSDN Git Service

am f21553ba: (-s ours) am 464aa220: (-s ours) am 9c2e42a2: am 009b0502: am 63e1a5a9...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:20:09 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:20:09 +0000 (20:20 +0000)
commit68878f33330a0f9e07f1a4d21b448f9fb6f71093
tree218b7252dcb3004700de741bbf41fe961c222281
parent11be0ad3615788f31bbbef1ece5595fc3b99635d
parentf21553ba855e53d03c7e887346304c200c99844f
am f21553ba: (-s ours) am 464aa220: (-s ours) am 9c2e42a2: am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f21553ba855e53d03c7e887346304c200c99844f':