| commit | 8e01cc768d0e892a6f193aa430d77d84ae410b3c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:48 2012 -0700 |
| tree | 29c9b2cfd93c646eabda7e2155d5eeaa7bf44b96 | |
| parent | c3aea8ea9f695712dd67edde21176753f890f33c [diff] | |
| parent | 2d1bdcf6d591a3014b6ee5c583246ae3fd9603eb [diff] |
am 2d1bdcf6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2d1bdcf6d591a3014b6ee5c583246ae3fd9603eb':