commit | ff35661b5de50ce40aea0bbbf900fadbf2e4fad9 | [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 | b94d66ea43d9ac552d8df1e883db0d66224a10d9 | |
parent | 876e7008418c9f23bcec4143c61d0331e8acfd5c [diff] | |
parent | f31aba7346c6991ac8848f3b3992651a68781a10 [diff] |
Merge "Fixing the build breakage due to bad merge."