tree 3dc1d515caaa01e20f130be09db9e7b3d56fcb69
parent 7c706fe44519c563c0a9c93c011888cb51855638
parent aff21e8831e9c5fe3bb50f9dd6c4a826110af647
author Ningyuan Wang <nywang@google.com> 1476220053 +0000
committer android-build-merger <android-build-merger@google.com> 1476220053 +0000

resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d am: e61906f92c am: 8851f93e19 am: 9856bfbc9a
am: aff21e8831

Change-Id: I10133bc15ee7dc237b563ace9dff6bf216148de8