2df264dca7e676e9eaf03bb6152a41eef809b07a - platform/frameworks/ex - Git at Google

commit: 2df264dca7e676e9eaf03bb6152a41eef809b07a
[log]
author: Chris Craik <ccraik@google.com>
Wed Nov 16 10:33:54 2016 -0800
committer: Feng Yu <feny@google.com>
Thu Nov 17 13:48:12 2016 -0800
tree: aca9d7d0418cb61aa97218f73224c7e03349adcb
parent: 62f48dbb7eb018c721c3a14f0d0f03395bced54a [diff]

resolve merge conflicts of 3802db4 to mnc-dev

bug:32338390
Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8

2 files changed

tree: aca9d7d0418cb61aa97218f73224c7e03349adcb