OSDN Git Service

Reconcile with honeycomb-mr2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Jun 2011 22:42:54 +0000 (15:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Jun 2011 22:42:54 +0000 (15:42 -0700)
commitbf5a5c894d8af7f3b3001ebbc596fd83a0a73c7e
tree12371bae4d12e11ebb385e548c0f9d41bef99e82
parent86a86930113b3e672b95b061332d814225d0763d
parentcc258c5dc5e0a41dd428f9cf337e2ef7097e9446
Reconcile with honeycomb-mr2-release

Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced