tree cbb86681de9f17218f80560276ed64fe77fa06e6
parent e2aa7e796e3139a3027661940170d03a97979f9f
parent 736fe75ad682ac2663bd3e8613521144e2269cab
author Prerepa Viswanadham <dham@google.com> 1430787957 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430787991 +0000

Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit '336b6a1' into merge_try2
  Merge commit '51d0dfa' into merge_try2