| commit | e49e8cc4e799a2a6793c148b6a4b74d8f69026dd | [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 | 51f6b14260b72406f96ddf44ec934c97d130880e | |
| parent | 07ee3418bbb6b83351641969b39463cf45a10671 [diff] | |
| parent | e4b8ff8068a96fe467d2334a75198ab762bb915c [diff] |
Merge "resolved conflicts for merge of 6a828712 to master"