tree 62c117ba9ccd77d82afcdc186f282645ab244618
parent e81a4f15185486cd67ff8983f9826d42ef653088
parent 953c05276e5b50a437d5d6f3bc7b9a4b0941d702
author Christopher Tate <ctate@google.com> 1480983439 +0000
committer android-build-merger <android-build-merger@google.com> 1480983439 +0000

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab
am: 953c05276e

Change-Id: If6e16f080e701171d7c9b69adbeaab3a6910b63a