| commit | dfaf80c60648b516108ff9e42d774c109e3d7396 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:42:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:42:41 2012 -0700 |
| tree | 1611eab25e219b2169a860e7f3b2bb217ffddb4b | |
| parent | 652c9023af9789dca33a22b5d3efe2680ac12f79 [diff] | |
| parent | 935ba80962920ff420bd4714046d1e4d8910889b [diff] |
am 935ba809: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '935ba80962920ff420bd4714046d1e4d8910889b':