commit | 01da3942da5e0703c8aede1657f67e6adc74ccf3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:29:01 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:29:01 2012 -0700 |
tree | 4f98e2019309c68a6235d5f9830d23ad61eef029 | |
parent | f68fcec168d7f2126b8d774628c4368f56dd6b76 [diff] | |
parent | 8359c2138a4e6bad5340cc3d17160aa035f185b4 [diff] |
am 8359c213: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8359c2138a4e6bad5340cc3d17160aa035f185b4':