| commit | 95bd428d79ad7c4ded83a94ac7e82a1c3d9cd0f9 | [log] [tgz] |
|---|---|---|
| author | repo sync <chiachi@android.com> | Thu Sep 02 09:26:24 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 02 09:26:24 2010 -0700 |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 5351c38f9a447bb2504bd0901a0dc58f71a062ea [diff] | |
| parent | fa0adc72d6fd9afe048c4c3e9cf95e6fd824f903 [diff] |
Merge "resolved conflicts for merge of 12eaf9d5 to master"