| commit | 67bc6c5edc2f8cf69c6de76df33284315f43f106 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:38 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:38 2012 -0800 |
| tree | 4377e3dcadcfbda9d688f0db9ea250c321a40b60 | |
| parent | 29c1c322892b17c965fc19a254e84bba4f3123fe [diff] | |
| parent | 91510a92292d80c861db3296c716592318ba02d6 [diff] |
am 91510a92: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '91510a92292d80c861db3296c716592318ba02d6':