| commit | a5018c900f126ee8424c82497f32983873db741b | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Sep 30 16:23:15 2013 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Jan 27 10:31:06 2014 -0800 |
| tree | 07c3977c96e3a2bd6d4bf0b0188c03975f6ebfc2 | |
| parent | e98d2cb65c0915d5278c593d14ff4bdc778557f7 [diff] |
resolved conflicts for merge of 5223a5ff to master Change-Id: I6523e4b7df88f21fbe0ecd3ab8f493e5a9867305