tree d3beeb9ae9744817c3067a50eed6c2e11fa56e6d
parent 24f3a2fe8f4b63497654a774af11615cd70b4c2b
parent abb0855010a918747a199367d99b5ca5ade105e2
author repo sync <chiachi@android.com> 1246331174 +0800
committer repo sync <chiachi@android.com> 1246331346 +0800

resolved conflicts for merge of abb08550 to master