| commit | 6465b03fff97f9982b38d80e56b224acfebd39bb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:00:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 19 14:00:18 2012 -0800 |
| tree | d8c705561299be3720103004f5ec12fd17d21517 | |
| parent | 0562a0dcc1bcbda59c753e659fbb2f9c3cd76869 [diff] | |
| parent | e25bb3c44ff27aad753b7a5cb74d5015f327e441 [diff] |
am e25bb3c4: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e25bb3c44ff27aad753b7a5cb74d5015f327e441':