tree fad075eeee5410694953487363c37c7be3d7760e
parent 67183fe838b1400139988a931ed4d6a6853d2199
parent 7743ece1634a17923112090374963d4919193c90
author David Gross <dgross@google.com> 1466030944 +0000
committer android-build-merger <android-build-merger@google.com> 1466030944 +0000

resolve merge conflicts of 5333a55 to stage-aosp-master
am: 7743ece163

Change-Id: I843b8620b797b823b26302537ebe82dd50fc9d12