| commit | 759445c5bdb2eb54af9e974f604226596976e078 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 12:51:55 2014 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Mar 20 12:51:55 2014 -0700 |
| tree | 55c1216c8ffc86e43bd0c89002e170e9987e6f9f | |
| parent | 754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2 [diff] | |
| parent | c53ad4cd807e74897ba2d7b799cb8ff6824b34e8 [diff] |
resolved conflicts for merge of c53ad4cd to jb-mr2-dev Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff