| commit | 32450ba903c601b4f024d33c51e243b1e6605507 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:54:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:54:36 2012 -0700 |
| tree | 46a056a53b3964bd05682d122132868a5a43a439 | |
| parent | 76e678cdde9630e6daa364e156ebd6d53a5768ad [diff] | |
| parent | d9db09d723538253169d4e297ff4fa974d16809e [diff] |
am d9db09d7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd9db09d723538253169d4e297ff4fa974d16809e':