OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:21 +0000 (08:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:21 +0000 (08:39 -0700)
commitf518b5982edc0fa8fb916f38e52ce54c56d6a11d
treec00bf7ad678b12ef6b13d86e952ea73c3ef183bf
parentb528116bba0e690f620ee2a150560ce8217490de
parent6f59ed855173f1b383fe5b610e5c7744a696f53f
Reconcile with jb-mr2-release - do not merge

Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636