repo sync 3d67c5688f resolved conflicts for merge of 12eaf9d5 to master
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
2010-09-03 00:24:26 +08:00
..