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:02:29 +0000 (15:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:02:29 +0000 (15:02 -0700)
commita6db845d24104eca99a0174af9fcaa713e838517
treecd14ec94f2dc16feac7aa5cf7546dfe45a72a33b
parent768ebe51f4490cd8a84a42b13f84ba5e6a366d11
parentdecac39d59fa3630d70ecb7a8cdd2703f6fbd3c3
Reconcile with jb-mr1-release - do not merge

Change-Id: I2c181ef0dd06df0086bd941ccf69b5c6aca437d0