tree 99a3176fae62642fc2c740419e22cb72c5a0d988
parent 9375b097db0b46e2a676c1eda6c2b962601d4b72
parent 6a29c64051af266b993ce8ebc33251a7192f990a
author Ke Dong <kedong@google.com> 1414711699 -0700
committer Ke Dong <kedong@google.com> 1414711864 -0700

Merge branch 'vendor_drops' into wifi

Merge the 3.15.rc1 from vendor_drops. This is the baseline which is
supposed to have the same behavior as the current build.

Change-Id: I16aed2d983b46ab8df4e9f8f09c4e5bf2b11831d