tree 11af59ce57ec093c026aac8516bddc31cb031a5a
parent 3fdee335fe95ab94ef1ee619ad37f9369447fde5
parent dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c
author Mike Lockwood <lockwood@android.com> 1259179551 -0500
committer Mike Lockwood <lockwood@android.com> 1259179551 -0500

resolved conflicts for merge of dfaf2e03 to master

Change-Id: I440d2042dd404a421789063e42102699fa33b7c0