| commit | 416d231f97c755b7fda1ca1f6d69c1ee7757e51a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 12:17:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:17:40 2013 -0700 |
| tree | 67b49a58e7ed9f8f2ce3cffeeaedc5fe6667eca6 | |
| parent | d74b3bb1cb1d0f0f710d86112209008d6bea51c7 [diff] | |
| parent | fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528 [diff] |
am fd59d4d3: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528':