tree 648a6b0d9be30791b29b9c0622cc1d146837d990
parent 9d8038e18c5964dfc61133bbb34d13961c18a385
parent a1211dfe75923f037c419c7358c75786cba1e952
author Logan Chien <loganchien@google.com> 1507178765 +0000
committer android-build-merger <android-build-merger@google.com> 1507178765 +0000

resolve merge conflicts of f877bd1d4 to stage-aosp-master
am: a1211dfe75

Change-Id: I83758e7f26285d543fc30a32286183813cada080