OSDN Git Service

am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:49 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:49 +0000 (13:00 -0700)
commit33adccd203ee8303cd0bf489e3f072d362e1705d
tree260be3ae7acecccb7ddf72a06a913149ee41661c
parentd0a9d5b6e0b557c3796616791fd3ac93d12bcad9
parent9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c
am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':