| commit | 81a034f14743a08ccf9e796880249f2d495f4c05 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 12:36:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 12:36:41 2012 -0700 |
| tree | 8223c14efa27f86214241da2067b080a89c8a750 | |
| parent | fbd1a85d7b9c176681731c679eefb370873acf6c [diff] | |
| parent | f6de0952d12995ae8808f46d0e4fa1f6974c1d61 [diff] |
am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'f6de0952d12995ae8808f46d0e4fa1f6974c1d61':