commit | 1e66e00113a063ed9af618d376961bcc036157de | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Aug 12 17:05:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 12 17:05:28 2010 -0700 |
tree | c71508fa97a0183f8b94a297e8f0abd9c93631dc | |
parent | 07bf58d9d62a9807443d27d8e1bde09126db7676 [diff] | |
parent | a4b2e09e9a6339a21d1308be344090e86329340a [diff] |
am 38a9f405: am e95d192f: Mainly fix two mistakes that I made: Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f' * commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f': Mainly fix two mistakes that I made: