| commit | 1657a0d586990d50c2fc8e8497d22b2db8ada13b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:48:54 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:48:54 2013 -0800 |
| tree | d8cd2ef1de7724d2c7f98b2567703b79f89b0f71 | |
| parent | 4a31681276dbb18a766eefe1b84836ba9bbcf3b1 [diff] | |
| parent | b3459b08c398250747a44a9d4e96ad3832e3e7f3 [diff] |
am b3459b08: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (5) and The Android Open Source Project (1) * commit 'b3459b08c398250747a44a9d4e96ad3832e3e7f3':