commit | 41a2c10e72e02ce9215c867a67b87ecfcc725149 | [log] [tgz] |
---|---|---|
author | Ken Wakasa <kwakasa@google.com> | Sat Nov 17 11:33:48 2012 +0900 |
committer | Ken Wakasa <kwakasa@google.com> | Sat Nov 17 11:33:48 2012 +0900 |
tree | 60b5b60bebf41d9949011bd7e39a71a86d48eb79 | |
parent | ea23a2855757074197671cab4211c547a8f92f30 [diff] | |
parent | 4ad92578dde88ad6442152c86dbfd8b107fbd550 [diff] |
resolved conflicts for merge of 4ad92578 to master Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef