tree f84ab1ea833126add4f3e78724a9940142d90cc1
parent 02e9affa42cd2ca3ae6b5f2947817f4ab72ea104
parent 6195acc2b55425bb7b0d00fcb9af374d90ee5af9
author David Christie <dnchrist@google.com> 1472076967 +0000
committer android-build-merger <android-build-merger@google.com> 1472076967 +0000

resolve merge conflicts of a2399b4 to mnc-dev
am: 6195acc2b5

Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be