| commit | eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:19:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 12:19:43 2013 -0700 |
| tree | 73a3aa27a8c71c9d16c46ebe4f65ba24a81cbf63 | |
| parent | 7a43a0c105e1392a4f604cae0164698daa571adc [diff] | |
| parent | f8fab17322ebc221fb493331c3a93b2d852704ae [diff] |
am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f8fab17322ebc221fb493331c3a93b2d852704ae': "JWR66Y"