| commit | 90998b8dd78f87f86e910f4b78583483da19e154 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:34:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 12:34:06 2013 -0700 |
| tree | a8409d2c53edb323ff632a8d03feffa18f10c0e7 | |
| parent | 3a0da6471d00e663f679856f28409f441bec8caa [diff] | |
| parent | eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0 [diff] |
am eb8e4d14: (-s ours) am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0': "JWR66Y"