OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:29 +0000 (07:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:29 +0000 (07:41 -0700)
commit292694aa0171ec032e9abb08f09b82319e27044d
tree959c952c01b60e32e5f39855085f2dfa084a9033
parent64ce9511888de9f42efe5561068d02eaf7c7df9b
parent9cf962bbfafafc74d6501902b63bce4b191dc45f
Reconcile with jb-mr1-release - do not merge

Change-Id: I4699c3ff7316df6659977ec08e7f386f98202c43