tree c74c625e4ba2f6386c24dce8df619a9ad0e0998e
parent 866b9728e0534012ca9c0a040a00282b3ed1e8a1
parent fc730e84c641e28cf864a6fb70f0963106ace075
author Prerepa Viswanadham <dham@google.com> 1430787957 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430787995 +0000

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

* changes:
  Merge commit 'fd9760e' into merge_try2
  Merge commit '41ce566' into merge_try2
  Merge commit '21ec0f1' into merge_try2