| commit | 19de90dad13a1ef40936a9f4fae1a884d8e536c9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 08 15:45:51 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 08 15:45:51 2013 -0800 |
| tree | 5a1cdad3aa0feb9b6a4d11e2924fd84f18749604 | |
| parent | 83a7149ba95546bc0acfbc7b74e250114f53148d [diff] | |
| parent | a3fa668449c8009bbfa764de597a130d9f0f682f [diff] |
am a3fa6684: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (2) and The Android Open Source Project (1) * commit 'a3fa668449c8009bbfa764de597a130d9f0f682f':