tree 79b172eedb64b17be773e36b13875c95a3ab56d0
parent 9f3436c3b153b55257caca0345c8135514b26945
parent 0fa7bb8caa7a1785591f4c17d37ddb9130560b34
author Chih-Hung Hsieh <chh@google.com> 1440023100 -0700
committer Chih-Hung Hsieh <chh@google.com> 1440023100 -0700

resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aosp

Change-Id: I5aee0816a8ab0d531df88bffd70c6c91e07ebdfb