| commit | 8998cc4836bf67af25461889f70afba6649e43a8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:40 2012 -0700 |
| tree | ef3eadabdd66dd30392c9a451410c5ad3950294c | |
| parent | df69e578358aa12f612da95113a06a21bbd9d93e [diff] | |
| parent | 0e448d3233af3c1cd9b12b38e9c5c88f57c5944f [diff] |
am 0e448d32: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit '0e448d3233af3c1cd9b12b38e9c5c88f57c5944f':