| commit | fb589ddc22c76c256c258277d885fb582a943543 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 28 09:47:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 28 09:47:32 2012 -0800 |
| tree | fc9a2bfebc358e6fa45c4c218c0ab3e28b154604 | |
| parent | e9f44fb66e805fd99735ccc3540e5f5e44b51fcd [diff] | |
| parent | f6315729088bb1ebbf5d8ab6e810dd3462973018 [diff] |
am f6315729: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'f6315729088bb1ebbf5d8ab6e810dd3462973018': JDP82