tree 95df40add23e127030abe0cb224c606659a33932
parent 2fc7cd69fd93df4bf2fb415acfd04cb02e905830
parent 179c0d80bccb6451c5552ae76dfe7081c8cf96bb
author Elliott Hughes <enh@google.com> 1466029337 -0700
committer Elliott Hughes <enh@google.com> 1466029337 -0700

resolve merge conflicts of 179c0d8 to stage-aosp-master

Change-Id: Iba5aec266444cabf83f600f2bdb45a3c027e5995