OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:15:40 +0000 (08:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:15:43 +0000 (08:15 -0700)
commit094c637b0450729fa2b20a4f63768f83daa0ac0e
treef5e250c8294a948f3bf40c231125fe199e4c5e08
parent8d950f8424bd5f48ce51b09b915964ec109bef55
parent4579c9cbda71c957abf536882faf90624b8497dd
Reconcile with jb-mr1-release - do not merge

Change-Id: I51e7a05d068725eb54c9cc38ab770707f7082c62