tree 8d93e7d4ec4c5002fbb441f97a15fcbe635bdda0
parent 970e33e69638f0a91eb534ffe45103c7efe218b9
parent 0b7b980761f3daa614ea725a5d432e8bd718eac6
author Brad Fitzpatrick <bradfitz@android.com> 1282678813 -0700
committer Brad Fitzpatrick <bradfitz@android.com> 1282678813 -0700

resolved conflicts for merge of 0b7b9807 to master

Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208