tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent 3335d50582e7f36396bf0299f88742c801aebe2c
parent cc619e2eca624d293e0e7f65f82305a5d925dbf7
author Hyunyoung Song <hyunyoungs@google.com> 1438113519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438113519 +0000

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

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