tree 79b172eedb64b17be773e36b13875c95a3ab56d0
parent d06a77f2f8b84ccc8f651003d507dcca6f1c6bbf
parent 01ce4e0dfd73d2ec550e2efdb4fb228ca836083d
author Chih-Hung Hsieh <chh@google.com> 1440652210 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652210 +0000

am 01ce4e0d: (-s ours) resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aosp

* commit '01ce4e0dfd73d2ec550e2efdb4fb228ca836083d':