tree 9be0a32e2861a358ecb0060827b773a5f524d7e7
parent 5153be7f94046cf2e7e34060f9d5ae4866abb015
parent ed60788968be61f4f6f47890e5f3cb182a6a2b6e
author Todd Kjos <tkjos@google.com> 1447864263 -0800
committer Todd Kjos <tkjos@google.com> 1447864263 -0800

resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp.

Change-Id: I9b07dd8dcb8fc74b658466b8dd47546cefffab1d