tree d248ebfca6085ff79f1a5cfb91a1778b4617ac82
parent 324993abed48843da1cb63063668147151e4db5c
parent fca0f92e0a9c121dcf28fa783e884f1fb4993374
author Elliott Hughes <enh@google.com> 1372462879 -0700
committer Elliott Hughes <enh@google.com> 1372462879 -0700

resolved conflicts for merge of fca0f92e to stage-aosp-master

Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74