tree b0e3b03f4c7a311ec7a5747da70b7071815c68fb
parent 57e9f2615b3346a30a16a19e5d0dabd2095738ff
parent d02d09416dd4e2f34d1e6d0207b6d7ce8b9a6cd0
author Brad Fitzpatrick <bradfitz@android.com> 1294265046 -0800
committer Brad Fitzpatrick <bradfitz@android.com> 1294265046 -0800

resolved conflicts for merge of 3a2c6bf0 to master

Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe