| commit | 99dc93648ffb2f71b8cad0a7c471b26505a87756 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 19 10:59:48 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 19 10:59:48 2012 -0800 |
| tree | 854856d5e7c32ef3db0eff1eb273624c7b860ecd | |
| parent | 2a43d74fb47c5cb812887265a9407e2544ed47b4 [diff] | |
| parent | 9d9def1b182247d55e69eff1fe0ec1adfb0a5e01 [diff] |
am 9d9def1b: (-s ours) resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge * commit '9d9def1b182247d55e69eff1fe0ec1adfb0a5e01': build_id: change to OPENMASTER