tree f8e23431207ebac6f3d86f039f21c1bd101289eb
parent af91bfbc040c47e73b0e04dc30f51ff8a9864039
parent e1d69c9d5aa3f359889fc73572a45cb89be2440a
author Hyunyoung Song <hyunyoungs@google.com> 1440677793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677793 +0000

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

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