| commit | f01e18bc0de016254c4ae6592f790724edb2b449 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:55 2012 -0700 |
| tree | acfc8b558580f0421840af5f9e94b328e18c1a90 | |
| parent | ca863c08ce349739af1bf1fd5a13f988b93c6fca [diff] | |
| parent | 20a08cc9916a2a65a557f533a6bdc2878b1bddef [diff] |
am 20a08cc9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '20a08cc9916a2a65a557f533a6bdc2878b1bddef':