| commit | 266a65b594bde81e02e0abdde1ad3ecd3c85da46 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Mon May 20 17:27:50 2013 -0700 |
| committer | Adam Cohen <adamcohen@google.com> | Mon May 20 17:29:15 2013 -0700 |
| tree | 0af0b4faf3c59a3142273ccff4ce31525c487ef8 | |
| parent | 7cf81f86af29125b792e4f29aa0780298232d004 [diff] | |
| parent | c9285ae2e58fb722d4c90c2042dace1531e97cf1 [diff] |
resolved conflicts for merge of c9285ae2 to jb-mr2-dev Change-Id: I33edb03342cc745b8b7d2b2c1784cdf33b059758