| commit | 1e6561ddfc941d51592a4285c8fe2d054ed29f02 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:30:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:30:11 2012 -0800 |
| tree | 3265f3735ccf546ff80e021c0e16ffc6a1670110 | |
| parent | 94fc236d199460bddc390ce7f384b446c14df622 [diff] | |
| parent | 17f1fe1a960db78c84aaa753c784a4df513a1d3d [diff] |
am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '17f1fe1a960db78c84aaa753c784a4df513a1d3d':