OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:43:58 +0000 (09:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:43:58 +0000 (09:43 -0700)
commit6bfe51550a6d31fa12bbfcf29190151457b901ba
treeb63a02b2aa99af1505c2d3695f2e3f21d064ec61
parent0e12aa4f236780795b03c737114c338237c0a83a
parent7538ddb0aa64b3bff7c762be2e6d05b213cd4189
parentd2789adec42145e041d534bc116639758733ee22
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibd02b2d1bdb7511eb777e72afd2d62b7327dca96