commit | 7daa48e62fa0ba002cffeddf8d520426a52d69a7 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Tue Aug 04 14:07:55 2015 -0700 |
committer | Tao Bao <tbao@google.com> | Tue Aug 04 14:07:55 2015 -0700 |
tree | c75ceededdc3b29bee0feb419255ec8f30998dd6 | |
parent | 0e2efab34546e1678855c979f06f0f56f4f38eb0 [diff] | |
parent | be19dce86ce7d4a83f1cfcd11db393f8be8f4397 [diff] |
resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp Change-Id: Ic11b543d45f565ffb5a1f2b7b06e953f0235bfb3