OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:53 +0000 (12:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:54 +0000 (12:37 -0800)
commitac022d9229eec51acbd04878067eba0c705e427d
tree5fcb94764c3e99acdc2f28f945a400e1d4660af8
parent8bebe981e5a347a6f99d6916f689fcaf9cd29c8f
parent2a1f2bae93cde0b485c7122ba89007334b7a8d04
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061