| commit | 165e6c01cab2c8d395493f93a4270c1cc24a2901 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Tue Dec 06 16:57:35 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 06 16:57:35 2011 -0800 |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | aac54b54b0b01aecc0a8be3d338b051a2939843b [diff] | |
| parent | 152ecbcbfd3541610caf47981a13261d3fc0cc7d [diff] |
Merge "resolved conflicts for merge of 6a828712 to master"