tree fa5044f4cb69e9648147b9522da4bcff66c981a8
parent 0142d49e1378a7155bcca1fb59965d9e73016dbc
parent 319226a894f5f0b94ca94e64f976a043e3873a40
author Brad Fitzpatrick <bradfitz@android.com> 1283386236 -0700
committer Brad Fitzpatrick <bradfitz@android.com> 1283386236 -0700

resolved conflicts for merge of 319226a8 to master

Change-Id: Ibeefaa496cc3970e35af007fb64344c2a0f1f82f