| commit | 6dc557e76bb66b3dca77d37801e8d1a10782f46d | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Nov 30 09:55:47 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 30 09:55:47 2011 -0800 |
| tree | 12628ec22bf1f54d78253b347e3e94b3ad8f0d20 | |
| parent | fd60a5c6aa16a2d3106f3cdc146d75229cafb7a3 [diff] | |
| parent | 136486defa30f98361e5a464c541e2220976c7e2 [diff] |
Merge "resolved conflicts for merge of 3d630e86 to master"