Merge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessde...
authorTyler Gunn <tgunn@google.com>
Fri, 11 Dec 2015 02:52:06 +0000 (18:52 -0800)
committerTyler Gunn <tgunn@google.com>
Fri, 11 Dec 2015 02:52:06 +0000 (18:52 -0800)
commitf14f94207ff8156fdd6d41776910aa7f3fa7ce0c
treea6db9dcd0aadb64c69918ecaca4105708f675c1e
parent26675a8d658a04b96a952761e199037471d65dfe
parent4c81117cd793aef6919495f5928a46f265d3ef7c
Merge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Change-Id: I3a24f26df9ae1813f3ffc05501ae78e794ec814e