tree 0bdc50203d9c0e856c77d3171bfe0bcb5a341782
parent fb6b8855a636a80bf039dc20814255a36a053fbe
parent dd515b1dda9eb10eb60003419534c8ea0567bc6d
author Elliott Hughes <enh@google.com> 1498706331 +0000
committer android-build-merger <android-build-merger@google.com> 1498706331 +0000

resolve merge conflicts of 99d2e72 to stage-aosp-master am: 761c9b2cc4
am: dd515b1dda

Change-Id: I1eccfc5454feaaddb66eaf6d3579f2d6fd9373ce