OSDN Git Service

Reconcile with honeycomb-mr2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Jun 2011 17:32:56 +0000 (10:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Jun 2011 17:32:56 +0000 (10:32 -0700)
commitd8f7de94f9f4f2d868a49451dcf97ade9c1f5a77
tree5b0474fde9db3930e79cf0eba0cdd96f1bcfaf44
parenta49ca6517003a18d326c1fd97be4b298cd583ed7
parentd1b18426d30645835d08dcfe58bff1f192f4272f
Reconcile with honeycomb-mr2-release

Change-Id: Ie64c22de6fee25395210fed13ed0bf2f53fa004f