tree 6a0343adfbf8d163bf2f0bae68b71f799c201c73
parent c6832775d16bcb7e7fd11b577fd9e4ce86f34d49
parent 8628ec7a18af23688a9a6b185914aa4d7170e0b9
author Jeff Sharkey <jsharkey@android.com> 1322768900 -0800
committer Jeff Sharkey <jsharkey@android.com> 1322769015 -0800

resolved conflicts for merge of c0715fd5 to master

Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20