| commit | 9d6166295be5747c9c6d7942ea1b109ee58e8bed | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:48:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:48:01 2012 -0700 |
| tree | bf0f47848a330918eece8f756ab9cf51eb687f4c | |
| parent | 0ac90af35b6db35770bbb6e5c95d880994f4cf63 [diff] | |
| parent | af528e0d33cb13e868e6f6e951297564432e1c90 [diff] |
am af528e0d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'af528e0d33cb13e868e6f6e951297564432e1c90':