tree 25c216043ca6b791307fc2bab04b030dbb351d6c
parent 5f040c325fc8b8f78a0ca861818f75ef7516fd33
parent b36980cc09971d3cc1125eb72d6ddbdbea82adcb
author Elliott Hughes <enh@google.com> 1466031001 +0000
committer android-build-merger <android-build-merger@google.com> 1466031001 +0000

resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f am: eaddde6888
am: b36980cc09

Change-Id: I1ebaa7e62c774f08a07360df7d8498872aaf4e9d