commit | 01ce4e0dfd73d2ec550e2efdb4fb228ca836083d | [log] [tgz] |
---|---|---|
author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 19 15:25:00 2015 -0700 |
committer | Chih-Hung Hsieh <chh@google.com> | Wed Aug 19 15:25:00 2015 -0700 |
tree | 79b172eedb64b17be773e36b13875c95a3ab56d0 | |
parent | 9f3436c3b153b55257caca0345c8135514b26945 [diff] | |
parent | 0fa7bb8caa7a1785591f4c17d37ddb9130560b34 [diff] |
resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aosp Change-Id: I5aee0816a8ab0d531df88bffd70c6c91e07ebdfb