tree 2264f009670ee2dfb3c232a6b66830a4b8734f6e
parent 73f561e7657a1afe3d4be888bb22c4af4f729e33
parent 917bb0e20a146a3ab4f7b0cebc4465d0806d0181
author Colin Cross <ccross@android.com> 1396048047 -0700
committer Colin Cross <ccross@android.com> 1396048047 -0700

resolved conflicts for merge of 063fa2d9 to master-nova

Change-Id: Iaa921a78fb59185404d24b6a4245ae2cb691ea5f