| commit | 7a7a658098d7441fd4bbf19215474319a8bb8e29 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:35:39 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 19 14:35:39 2012 -0800 |
| tree | 243be38fb074a20becfb33ea81b7988a7f3caeec | |
| parent | 816227873e7f8a88109081013bd8392de55a7424 [diff] | |
| parent | cb671fc81f9ecf64b868fabcbdce1276d9b0ea3c [diff] |
am cb671fc8: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'cb671fc81f9ecf64b868fabcbdce1276d9b0ea3c':