OSDN Git Service

am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:46:34 +0000 (07:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 15:46:34 +0000 (07:46 -0800)
commit7476f782df28383b45b9942c2e59d32cc67c648e
tree132514acc96da8fe82e34fde021fd66de01a9b68
parent522de14ab481ddb76d619ce610105fb6c1390eea
parent346f5a481b945251245429be649c005a0d9103ad
am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '346f5a481b945251245429be649c005a0d9103ad':