OSDN Git Service

am 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:08:21 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 15:08:21 +0000 (08:08 -0700)
commita14f5265b82bb7da94c5b478044e00e1a3ff6d3f
treee5fadb2f26899bc340141accfe01cb9fff7cd21c
parentf45ffab037ff8ea5dc0ee8cd91c554baba77b249
parent72034c6c5ff3f2114f9ed4dbade58e8fabddad03
am 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8616d32f7382563a1aea192e835b2cbbefd9f481':