| commit | 09af95d3280e7d6753ff452e07a54f5de7fd4632 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 14:23:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 05 14:23:43 2012 -0800 |
| tree | 2c360a3aed980031b9aef13e7a568363ef2f64c7 | |
| parent | e0a1a309c9b6cc6c1dacf24351834e5689b45f80 [diff] | |
| parent | a8d9db48cac077478c715459ee097008b4152eda [diff] |
am a8d9db48: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a8d9db48cac077478c715459ee097008b4152eda':