tree bfaeb599f6a3664a628a4015bdaf79c3873ca34f
parent adb4229c23faef81705b6b2fe1dfb8a6474c254c
parent 700889f504ef134ab307d95b6bfbbb426ea730e3
author Brad Fitzpatrick <bradfitz@android.com> 1286916764 -0700
committer Brad Fitzpatrick <bradfitz@android.com> 1286916764 -0700

resolved conflicts for merge of 700889f5 to master

Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04