OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)
commitcf8f3b2426c788bb5d83e11bee74e128e9c37309
tree4cce1ee701e5656d94ba62d36862ab3c591fc350
parent40483c7371578ca7477ea0a07d6541fe1daf0f4c
parentb97ae066d57a62781583cb53e9f346ccd2ab5e1f
Reconcile with jb-mr1-release - do not merge

Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641