| commit | e469b590341bceb86d558e6b1ffa669089177de6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:13:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:13:01 2012 -0700 |
| tree | 652c95d1801479b9fabd4edb30ea678737352860 | |
| parent | 7f8be6a55389c5333d6801583d1966fe50b375e3 [diff] | |
| parent | 4d1ca6fb1cc5b7139de283212079636e9fd83b37 [diff] |
am 4d1ca6fb: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4d1ca6fb1cc5b7139de283212079636e9fd83b37':