tree 96beaf07307486f6491f022da63ebe381765d1a8
parent db124b5d61350e1a53ea613f4f6a618325894cce
parent 102c95dbff6d166292903e40dad7b364e59ef1c9
author Hyunyoung Song <hyunyoungs@google.com> 1438114719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438114719 +0000

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

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