OSDN Git Service

am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:47 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:47 +0000 (12:41 -0700)
commit72c7cf9d13f5a51a71dccc6d94317727bd0feec3
tree26878ce2fbb731f6cdd47a55ff1cfae54e9e58ee
parentf0ff908da019a44115109f1b4d1b6864b35a8a29
parenta1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c
am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':