| commit | d099e0cef71f1f8cab13eb05d2b3d4024907d163 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:06:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:06:14 2012 -0700 |
| tree | 774801db4ef53d135f901670d5a0670530fe7b54 | |
| parent | bdccacea623d2ea36ef2dbdae6750ae1c398dfe9 [diff] | |
| parent | 3873f6f83cc1b9ea50548e9f79f2d1696bd77f6e [diff] |
am 3873f6f8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3873f6f83cc1b9ea50548e9f79f2d1696bd77f6e':