tree 73def3b48c94e98e819856af2701e0cc598bbf80
parent 08535a574e603bd50f5ea89f8eef4378c23e945d
parent 82bf63fbdff18686ab28e3c510e3b2dda9046979
author Hyunyoung Song <hyunyoungs@google.com> 1440706953 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440706953 +0000

am 82bf63fb: am e1d69c9d: (-s ours) resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

* commit '82bf63fbdff18686ab28e3c510e3b2dda9046979':
  resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp