OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:22:49 +0000 (07:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:22:49 +0000 (07:22 -0700)
commitd970d9e56173111f9e016a5a0c9f5e532758eefb
treef866a56e683facc5264c52974a0047a69c102bde
parentb5de2bb12924525804f7569a1d6ac0af4e0d278d
parenta1f46288c8f5f015f73fa32fd7c6b40504cda7cd
Reconcile with jb-mr2-release - do not merge

Change-Id: I0497c8b9687906dfa54125cd9298a2474f423e3e