All charges dropped by the DA:

http://www.10news.com/news/san-marcos-woman-cleared-of-battery-resisting-arrest-07212014

Glad to see that being whiney and irritating isn’t a jail offense yet.