| commit | 553e157a0f481b70c990e216b1c7b6a0a2b98610 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:35 2012 -0800 |
| tree | cf4f33a9eb00bcb96381143e77e128768ed96ae4 | |
| parent | 0e9530291ab64a7e788047110650844539bc7e95 [diff] | |
| parent | ee76e18125438183d7e7bfa5e2b10172fcf565ec [diff] |
am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec':