| commit | 40e828993405286e7e1f021fb5be65094bb6fe52 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Wed Oct 06 17:04:44 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 06 17:04:44 2010 -0700 |
| tree | a7bfd968eda8923e42aaf2bc98b9b40b9fe7f42c | |
| parent | a6983b4ee5def8ee4951213d7fcc8b90149605af [diff] | |
| parent | d2a71c793ee680652d4de864f938a050830031ac [diff] |
Merge "resolved conflicts for merge of bba3b8ef to master"