reconcile android-2.1_r1 snapshot
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:07:57 +0000 (14:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jan 2010 22:07:57 +0000 (14:07 -0800)
commit8aeca2d493fe8190e2621c1c51f176447faa60c3
tree85226b322c93fd12fa78fa6d78166afba5886656
parentd5dc7761c9d77a6dc30cd3ffc1f7ec7e5a934df8
parentfcb9ea0143354d6faf91b14ca10bdb41f843d01a
reconcile android-2.1_r1 snapshot