tree e3294c3b2b32cd3532fa9b239326b1aaaa79fc40
parent 680c92febe88260b74f101838a9734b8e10a704c
parent e612775922ec9f8cc4e5cb976bc62b3312a3de0e
author Hyunyoung Song <hyunyoungs@google.com> 1438110911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438110911 +0000

am e6127759: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

* commit 'e612775922ec9f8cc4e5cb976bc62b3312a3de0e':
  resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b