OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000 (15:03 -0700)
commit2b24add32eb6d0250581465bdc6961114cca86c3
tree3ff493063c90ece56f6faeb822fa3dcf8317120c
parentb3bcc46c362408e78c935543b0f7a519e4d6ed87
parent08da0bf17caeb564d7fe7a0b08b057df2f8ca45e
Reconcile with jb-mr1-release - do not merge

Change-Id: I198408ef678851f19476836b10a2fc002dd11a95