| commit | 4763a25717336a7f8f4b17ae3828de59738dc6cf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:21:29 2012 -0700 |
| tree | f08ac307e4a4813b4ba4293aa3b90ad33e86937c | |
| parent | 7daad9e298821c8d478151e4a06565c0650144ad [diff] | |
| parent | c0381e729692117042c156b85e7d86e90212c40f [diff] |
am c0381e72: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c0381e729692117042c156b85e7d86e90212c40f':