| commit | 3274e2ffd630025c2c67a18a705923f4691d16dd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:59:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 05:59:25 2012 -0700 |
| tree | 7591453012a8b5373991f01ce0a3539603330f6f | |
| parent | c1d798b3d1ccdc06a536a729a65f664fc6effc2c [diff] | |
| parent | d1c39d54521d141e646617cdfcd57f1f08b6de02 [diff] |
am d1c39d54: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd1c39d54521d141e646617cdfcd57f1f08b6de02':