OSDN Git Service

am 01c11f67: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:44:33 +0000 (15:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Nov 2012 23:44:33 +0000 (15:44 -0800)
commitf33f26fae4d1ef940b3f30605d1f79d8c914b685
tree76219269fa25b2fe236f03329d4a06f9cec9871e
parent609756275ceefb1b8ad7362cadb43e595efbfcf9
parent01c11f67fd31d693f00c9c5a961ca251699d233b
am 01c11f67: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '01c11f67fd31d693f00c9c5a961ca251699d233b':