| commit | 258a0a5ac175fabff764d925a460e009e121a361 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:31:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:31:43 2012 -0800 |
| tree | ab23c636fbae8d902c3e60359c383d3a95e58311 | |
| parent | 846c686b6663b15833e1827ff8f0232f9a959576 [diff] | |
| parent | 1ca4b7d26a46d7b779a687f43f2c30ea779693de [diff] |
am 1ca4b7d2: (-s ours) am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge * commit '1ca4b7d26a46d7b779a687f43f2c30ea779693de':