| commit | 768a34bdf77d7d42ec55ba70c8e2f799470fc91f | [log] [tgz] |
|---|---|---|
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Fri Jul 02 08:34:56 2010 -0700 |
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Fri Jul 02 08:34:56 2010 -0700 |
| tree | 1ff13383785c1d32b802d14b63ef81811491bf1a | |
| parent | 9f45f73090712f07360b70556705d3fe9f0d129d [diff] | |
| parent | 7d735133cd6f019ce839fa824f4507f19aff2e8f [diff] |
resolve conflicts in build_id.mk Change-Id: I06a86ec9e2c22b8f948d3dd8041081373d222131