| commit | a9ea0249a014884a60d08d7c669dff3366da8f2d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 29 09:54:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 09:54:39 2013 -0700 |
| tree | 53fa40a188bf35069afdc537650964c88e7b8c3f | |
| parent | 5e61ab0d7779be5807dbcfdde2ad2de881c06634 [diff] | |
| parent | e4e16d0cfbc8799f2c2ba6c500465668c192f23f [diff] |
am e4e16d0c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e4e16d0cfbc8799f2c2ba6c500465668c192f23f':