| commit | aeb3751559dc6a8ed71a9463700941303cf44ba0 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Nov 30 10:05:20 2012 -0800 |
| committer | Makoto Onuki <omakoto@google.com> | Fri Nov 30 10:05:20 2012 -0800 |
| tree | 23b68899cfdf803e673339edf166775223df250f | |
| parent | 38ddedc8adfc4d58f4bebe4a51149e4768d42f70 [diff] | |
| parent | 9cd8c711a7ed0690e268fc930e6f8d0d594c17e5 [diff] |
resolved conflicts for merge of 9cd8c711 to master Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828