| commit | 900372d120596ecd1764ea19a18251f51e52125a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:37:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:37:16 2012 -0700 |
| tree | 781d0ba44ff37c50ad80e8af98473a76b31fad01 | |
| parent | 4804c512374deaf0ba40c48a10e0b034f1baf7b3 [diff] | |
| parent | 5c947e5b3225736666bef19d7dba4f2371d7e580 [diff] |
am 5c947e5b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5c947e5b3225736666bef19d7dba4f2371d7e580':