| commit | d36aa68ea2593494ae24dc6ce9c16d155600956d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:52:43 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:52:43 2013 -0800 |
| tree | 9c8926e358444dfbf596757ef26ce2d986c3c61c | |
| parent | c163c606f66be93153dfef45349ac03018224f3d [diff] | |
| parent | aee2de934d55c27f695d8fb10b775718871ecbd7 [diff] |
am aee2de93: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (8) and The Android Open Source Project (1) * commit 'aee2de934d55c27f695d8fb10b775718871ecbd7':