| commit | 1270748b1c5d166a58b9ac0e8fa281bd404f6abf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:42 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:42 2012 -0700 |
| tree | ca3bf242839c0c6a90ae0403b905457cbae31f5b | |
| parent | 47f7d0bed40f1928db116f532b40517ee9e3b317 [diff] | |
| parent | 8ffb9fe92da8475f2cacf53f697cd5645d0f007b [diff] |
am 8ffb9fe9: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '8ffb9fe92da8475f2cacf53f697cd5645d0f007b':