| commit | ffb54540a706ee33bff613ba6deab98ea0d54b57 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 17:16:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 17:16:34 2013 -0700 |
| tree | e7948e990d227dbae2352a238a9989e5e95d4d1b | |
| parent | f39d05083dd349732230011fabefb46bbe1082d8 [diff] | |
| parent | e2fe6c041f65faf3279b663b4392f934b898a85b [diff] |
am e2fe6c04: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e2fe6c041f65faf3279b663b4392f934b898a85b': JWR64B