| commit | 41d9c2ff21b5df41159d92749fa4b1f0673e6c74 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:22:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 08:22:44 2013 -0700 |
| tree | bc3edafb310b99cf7f27d1cc5afa8849cc7b32d0 | |
| parent | cb5368356eaa169a79d6c7d315fae8b371a41b50 [diff] | |
| parent | f0e52b648b435634d8cbcf52cac86c8dac9e4a63 [diff] |
am f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f0e52b648b435634d8cbcf52cac86c8dac9e4a63':