tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 57d4540382cb5dbca228fd17edd35b59b6b6b00b
parent 724e51e88dea60401102d00ecf87b63f565e09bf
author Hyunyoung Song <hyunyoungs@google.com> 1479952861 +0000
committer android-build-merger <android-build-merger@google.com> 1479952861 +0000

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

Change-Id: I2ed77afea9f22d4f34007dbb11908cd22d814dc1