tree 187dc5ae554eb2afa79d1b59643473ae5dc221cf
parent 1c844f5796f6b8ee5bd9d3019a86360f97b097e0
parent 5a4f8316df580b0dbfe1e4b86819f2a6d68d7e10
author Elliott Hughes <enh@google.com> 1466135800 +0000
committer android-build-merger <android-build-merger@google.com> 1466135800 +0000

resolve merge conflicts of 55caa15 to stage-aosp-master am: 2694c6a594
am: 5a4f8316df

Change-Id: Ib347a61b7e83521eb36a7042a608af1daa66304d