| commit | 03e9838357efd20ad6f7be9f182534da63abdcad | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Fri Sep 20 09:54:56 2013 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Fri Sep 20 09:54:56 2013 -0700 |
| tree | 9176f5f0d4e237876ed1ccb15cbad6e5ab5c2f8e | |
| parent | 44634bbefcd1bf63469e20801aa688670447d7c3 [diff] | |
| parent | db7659e0d33b4d573cbd257e23bb4a2cd96fbc82 [diff] |
"resolved conflicts for merge of db7659e0 to master" Change-Id: I5c09680bbc6263d38f995f053c747199eb569c32