tree 6c4ba7b40cb4a95910328bb915d055fe88f25742
parent a94aab6a6fe3d334ae65296da6883cc2b6640db9
parent 4dd28dc25895165566a1c8a9cac7bcd755ff8fe3
author Vinit Deshpande <vinitd@google.com> 1426209671 -0700
committer Vinit Deshpande <vinitd@google.com> 1426209671 -0700

am "Cumulative patch from commit 00033a0903f69b2f0e0c048840bff059f5a3eab9"

merged from goog/mirror-m-wireless-internal-release
4dd28dc Cumulative patch from commit 00033a0903f69b2f0e0c048840bff059f5a3eab9