| commit | da8e8962a36f8d69a48ba01c77174662f8541b04 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:08 2012 -0700 |
| tree | d917c4babc54944f67ea521c2e2781e48395ea39 | |
| parent | 59e8423f9cefab6a5fdb093ca27a06143c9d44e5 [diff] | |
| parent | b4513a02eb6a2dfee3f384eea1d61f1989a7517c [diff] |
am b4513a02: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'b4513a02eb6a2dfee3f384eea1d61f1989a7517c':