Brian Carlstrom 1bcbf3593d am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp ... * commit '712676772b0d6e32bdce3430eed0a4d9771aac7e': Add OkHttp to the platform.		2013-04-03 15:03:48 -07:00
..
board	reflect the migration of emulator hal to device/generic/goldfish	2013-03-11 09:41:17 -07:00
product	am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp	2013-04-03 15:03:48 -07:00