OSDN Git Service

am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:41 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:41 +0000 (13:13 -0700)
commit565af3834c8c4c353fd9bbdffcf2b7817b55f09b
tree9c3aa79c8f9d81358a23f7eea34f4883b27e3d9c
parent6e0bff0d1bc52b90a4219b26f93ed41329415098
parent33adccd203ee8303cd0bf489e3f072d362e1705d
am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '33adccd203ee8303cd0bf489e3f072d362e1705d':