| commit | cdfb5bac3a5721b895cea4789ac2384ff6546992 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Mar 14 12:41:16 2013 -0700 |
| committer | Raphael Moll <raphael@google.com> | Thu Mar 14 12:42:04 2013 -0700 |
| tree | c34f6906b685bb6d1a9c73def341373b2937be40 | |
| parent | 6e2d53a5cdcc99e3927ae5db537dd74eb5474daf [diff] | |
| parent | a3aea5b6eba3007b02b6a44d8eccb6883037278d [diff] |
resolved conflicts for merge of a3aea5b6 to jb-mr2-dev Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae