| commit | 44634bbefcd1bf63469e20801aa688670447d7c3 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Thu Sep 19 17:44:13 2013 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Thu Sep 19 17:44:13 2013 -0700 |
| tree | 9176f5f0d4e237876ed1ccb15cbad6e5ab5c2f8e | |
| parent | 34fd7fc8b7c16e3ae75564a924e6a4d4ecc674a2 [diff] |
resolved conflicts for merge of db7659e0 to master Change-Id: I6b56fabd07b18dfcb25be83834e4f248f8aa4a40