OSDN Git Service

am 19409cd0: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:54:39 +0000 (07:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Nov 2012 14:54:39 +0000 (07:54 -0700)
commitb1cfada58a7a259e527e025b2b69806ef8121a57
tree5862b78d667371e87353d024d877a07edf11fa94
parent85bade19e46fd326f1a4bf97424ef0ad697fbc81
parent19409cd098ff01560443298f40652953222da067
am 19409cd0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '19409cd098ff01560443298f40652953222da067':