| commit | 7d55bea91fc7ae146ed35cd26683966aa0ef5bfb | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue May 27 12:29:41 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Tue May 27 12:29:41 2014 +0100 |
| tree | ce654cb33ecc56e3bb3fa0dbb2f29ddd5e97908c | |
| parent | cc254368412969723cd348a8ee8d8e95a70372fa [diff] | |
| parent | 38c3c9309f12b2c9152bf69848f2f3aeb9832251 [diff] |
resolved conflicts for merge of 38c3c930 to master Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2