tree f2463314aab86402eea790f664e13dc6c81ddd21
parent 12ad1c6dc4e1149a332ae154a37f3f3d830da959
parent 1d4518672c590b2f8af6c0561990e6a1daea5a40
author Elliott Hughes <enh@google.com> 1470258858 +0000
committer android-build-merger <android-build-merger@google.com> 1470258858 +0000

resolve merge conflicts of ed3596a to stage-aosp-master am: b6e1d15056
am: 1d4518672c

Change-Id: I6407af82baad305adc5593889fc1eb342d06f6a1