tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent 9486780029868bc04e2bd2f2c2ed34283fa2d25d
parent 6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7
author Hyunyoung Song <hyunyoungs@google.com> 1438112297 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438112297 +0000

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

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