| commit | 6c625f67174cf12ecec1c2c86e9541a7a08e0607 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Jan 17 11:56:04 2014 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Fri Jan 17 11:56:04 2014 -0800 |
| tree | 1afc698454281262d6e8e06a2e6394846450d7a4 | |
| parent | c176e14ce3fd28432e2eaca7bc7a60046dd8be40 [diff] | |
| parent | 47fa90641e5321f853d50de1e129b6233fa183e1 [diff] |
resolved conflicts for merge of 47fa9064 to master Change-Id: I53fb8ff2dfbefe6246385e624c5c3525cc6f4253