| commit | 19889da06c66cea8f422492dc9798665929549ac | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Fri Oct 28 16:42:06 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 28 16:42:06 2011 -0700 |
| tree | 1d90b398fb949e1e316b658c863f2f87f7814afb | |
| parent | 92e746f8aaf819a473c34a2edc74df2037761271 [diff] | |
| parent | 9bb9fcaeb1f170c6a91057b495edd463df9062c5 [diff] |
Merge "Fixing the build breakage due to bad merge."