tree a176a65373e518c886c57571445740de7884eee1
parent 603746f0e3b645954f33be36f7602cc8205cb71c
parent c0df50afdb8e738df311c44ab80507b9470070ed
author Colin Cross <ccross@android.com> 1370902003 -0700
committer Colin Cross <ccross@android.com> 1370902003 -0700

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

Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c