OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)
commit5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0
tree065afe21914662e958c7a37019c73278b9a3e91b
parent70992e04d00e6708d33adbb7c016499b6e030d68
parenta66c0c1b4545131a78b6760d7c8ce6e09dd5e1f5
Reconcile with ics-mr1-release

Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b