| commit | 3bfe1ce3d04c2bfe610f0a513b7212615de590f7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:15 2012 -0700 |
| tree | e94f63ecfd7389f6fc176271f23e07476f795c3d | |
| parent | 5cbb130618c5ca01222d367b9260386c24a8b503 [diff] | |
| parent | fd04a7abe7722be94c84e24dc71a2b695e3ddafc [diff] |
am fd04a7ab: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'fd04a7abe7722be94c84e24dc71a2b695e3ddafc':