| commit | 645cab0adb97152c15924ec1957dfdd63585db5e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:47:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:47:52 2012 -0700 |
| tree | 2b230072eb16c0017c468bb28b39f6b7c385352f | |
| parent | 58deaa8b29c2cb437c1e268a2587b5fd32012e4c [diff] | |
| parent | dc9c3a4f2bdd2825e396cb01eafb06122ceea257 [diff] |
am dc9c3a4f: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'dc9c3a4f2bdd2825e396cb01eafb06122ceea257':