OSDN Git Service

resolved conflicts for merge of db3146c0 to klp-modular-dev
authorJeff Brown <jeffbrown@google.com>
Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)
committerJeff Brown <jeffbrown@google.com>
Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)
commit6ae4d53b571cb71cc6c2ad55d12679d22e9334d5
tree5b1109d42bf49d77eacbbfafb2661588b8b4cebb
parent41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3
parentdb3146c039750f68418e0908037a8bed3890913c
resolved conflicts for merge of db3146c0 to klp-modular-dev

Change-Id: I1500228392add2de325b9530ae33d7c3e738c021