tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 436d8808f6ff531eb1112a6639aaf59273eb6878
parent 74d09c3dea0adc6d3a0680ed5f93c7468f994da5
author Hyunyoung Song <hyunyoungs@google.com> 1479953140 +0000
committer android-build-merger <android-build-merger@google.com> 1479953140 +0000

resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c am: 724e51e88d am: 044e71c2d0
am: 74d09c3dea

Change-Id: I090af0ecbc90d833a06b5a4f26010b85d09edb42