| commit | 6af812c174abacf1001b8d8e604af095bf88f0fb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 07 13:40:42 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 07 13:40:42 2012 -0700 |
| tree | a017aa5ce95a961ef793dc95289cedc575fb0e30 | |
| parent | 96535ba62044c712f8b017fe569f598a7a2934c2 [diff] | |
| parent | 83e3842f4efc2647752d85af81869034dda985f6 [diff] |
am 83e3842f: (-s ours) am 7908a68e: (-s ours) Reconcile with jb-release - do not merge * commit '83e3842f4efc2647752d85af81869034dda985f6':