OSDN Git Service

am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:37:44 +0000 (14:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Feb 2013 22:37:44 +0000 (14:37 -0800)
commit8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554
tree943d5802052548f27bdaac3ed97b784c8b142b26
parent0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98
parent94c31c85f67ff10a1ea496ce9ea12809174f72c0
am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge

* commit '94c31c85f67ff10a1ea496ce9ea12809174f72c0':