OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)
commit8ee99aad34a1fae6326037243b0879e2095f3ad6
tree0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4
parentce3b88b145cccef10a84a783bc075bdd8e19cd5a
parent859836c47de1c1f252a4b63320508f16450bd02a
Reconcile with ics-mr0-release

Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80