| commit | 37c2223e8c73adc4cfcd5316bd1e9e50da6a167a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 05 15:58:53 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 15:58:53 2013 +0000 |
| tree | ac27626cd7459857f86b04109a72f3f8f85dfce8 | |
| parent | 74e59d49b1d2f59d64b653c3645cf82d767d6ea4 [diff] | |
| parent | c3db47c15529aaf9c88fd86d63dcc70e6d9c4e66 [diff] |
am c3db47c1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c3db47c15529aaf9c88fd86d63dcc70e6d9c4e66':