tree f3296d85930b340675dc2c41bcb80ac29af16e03
parent 7b8a803497450bb90b9c4f5ba3426bf984fad274
parent 0d85990f20106513b6da5a446702aa62ab61397f
author repo sync <andih@google.com> 1294788411 -0800
committer repo sync <andih@google.com> 1294788411 -0800

resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp

Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26