OSDN Git Service

am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:28 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:28 +0000 (13:13 -0700)
commitc5604b081b6cac558ed94dce88dedf1a467185b7
tree374bc9528681b6bc179ca02dfcf8ca0d8afc48c5
parentc0048178a1d312e7e05557ba99becd6a89b9e97a
parent0fe40641db3759088edc1bc7f0182556d77bede6
am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0fe40641db3759088edc1bc7f0182556d77bede6':