reconcile android-2.1_r1 snapshot