tree 609852deffc666a424ccdac00f8db85694480aca
parent 5b11e0e5d8cbf3fd2b66ce47f5097cf5e6d68aa7
parent fddbfbcd6cc080dc706a851374c4cc8bcbf61f81
author Vinit Deshpande <vinitd@google.com> 1429151762 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429151901 +0000

Merge changes from topic 'mwd-merge-041515'

* changes:
  Fix build issues after the merge
  am b04d61a..697f674 from mirror-m-wireless-internal-release