OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
commitf6f4abec09afda4d802ac0b7b2006d86a6161892
treec2d7c6b12bf5299f33a0aa588f7a624e27b2eb30
parent4f950b02b321f6414dd9ad48b34560ee7f4e6b77
parent256a75f816fa954c7bb62b6adc2ba53eebc6c6c7
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4