The Treaty of Cahuenga ended the fighting of the Mexican-American War in California. The treaty was signed by Lieutenant-Colonel John C. Fremont and General Andrés Pico on January 13, 1847 on the kitchen table of Tomas Feliz's six-room adobe house in what is now North Hollywood. Under the later Treaty of Guadalupe Hidalgo (1848), Mexico formally ceded Alta California and other territories to the United States and the disputed border of Texas was fixed at the Rio Grande / Río Bravo del Norte.