OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:06 +0000 (07:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:06 +0000 (07:29 -0700)
commit65c8df8530418c66eedb06fa13372bcd41409492
treeef0520c46824bfae1d128351b25d586259cf4a90
parent7c5e12ada07c2f1334b29624adc97c7b6528db52
parent1cccfe8c0b59094a2564d268040478ecb278e790
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia76fbf94fed108207ae3cb4d53f710f81aa4311f