tree caf1ac41223ad3999b134d49fcd62a7f6783b41b
parent 7400df9487151a9d53d00a0cc973a0164d22aecd
parent 80047faad914c9b9b4966d6b58fc22800c3fcebc
author Vinit Deshpande <vinitd@google.com> 1429151762 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429151790 +0000

Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"