tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent aff2b79dffbc366746bd1f8db1125b8a6afb6c22
parent 044e71c2d09dcdc24ae9013857aede85f59b5808
author Hyunyoung Song <hyunyoungs@google.com> 1479952978 +0000
committer android-build-merger <android-build-merger@google.com> 1479952978 +0000

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

Change-Id: I7b4ed8280010e11cc4d3153bde326e917f1a30cb