| commit | 01ccbe775b101e6e14c64da63564429b2f7ae12a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 14:36:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:36:44 2012 -0800 |
| tree | 79669efb7b2e79ac59781bc9bbdada562f559cbd | |
| parent | 890658429d1d0d4217364c91425b9b928e212c9a [diff] | |
| parent | 875443d4b56226cf7f4f5155f4c4b6f8293f6f57 [diff] |
am 875443d4: (-s ours) am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge * commit '875443d4b56226cf7f4f5155f4c4b6f8293f6f57': JOP40E