| commit | 29e746211878d5204e983ef1fc2812d444052f63 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Oct 01 15:43:16 2013 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Jan 27 10:31:06 2014 -0800 |
| tree | d7138c680bcf1d8eb72217017f13f584ac432ed6 | |
| parent | 94fc9124f51f0a101cc11e4563f9c647980fe2aa [diff] |
resolved conflicts for merge of fb2e3c8d to master Change-Id: I159b529adae04a33a965ec0d43fc9a47e82b6417