| commit | 446cc5b6d887a3ea902f0e883158bec5c8c09462 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:11:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:11:08 2012 -0700 |
| tree | a017aa5ce95a961ef793dc95289cedc575fb0e30 | |
| parent | 75ad34327739a02f76ecfae06d9026de3834e6b2 [diff] | |
| parent | 83e3842f4efc2647752d85af81869034dda985f6 [diff] |
am 83e3842f: am 7908a68e: (-s ours) Reconcile with jb-release - do not merge * commit '83e3842f4efc2647752d85af81869034dda985f6':